Merge remote-tracking branch 'origin/master' into 1.9

# Conflicts:
#	Source/Engine/UI/GUI/Common/Button.cs

Source/Engine/Networking/NetworkReplicator.cpp

@@ -1302,6 +1302,11 @@ bool NetworkReplicator::HasObject(const ScriptingObject* obj)
     return false;
 }
 
+void NetworkReplicator::MapObjectId(Guid& objectId)
+{
+    IdsRemappingTable.TryGet(objectId, objectId);
+}
+
 ScriptingObject* NetworkReplicator::ResolveForeignObject(Guid objectId)
 {
     if (const auto& object = ResolveObject(objectId))

Source/Engine/Networking/NetworkReplicator.h

@@ -116,6 +116,12 @@ public:
     /// <param name="obj">The network object.</param>
     /// <returns>True if object exists in networking, otherwise false.</returns>
     API_FUNCTION() static bool HasObject(const ScriptingObject* obj);
+
+    /// <summary>
+    /// Maps object ID into server or client ID (depending on the source ID). Leaves source value unchanged if that specific ID is unused.
+    /// </summary>
+    /// <param name="objectId">The network object identifier to map. Contains result ID once the method completes.</param>
+    API_FUNCTION() static void MapObjectId(API_PARAM(Ref) Guid& objectId);
 	
     /// <summary>
     /// Resolves foreign Guid into a local ScriptingObject