Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>

Gems/Multiplayer/Code/Include/Multiplayer/Components/NetBindComponent.h

@@ -193,6 +193,7 @@ namespace Multiplayer
         friend class EntityReplicationManager;
 
         friend class HierarchyTests;
+        friend class HierarchyBenchmarkBase;
     };
 
     bool NetworkRoleHasController(NetEntityRole networkRole);

Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyRootComponent.h

@@ -96,5 +96,7 @@ namespace Multiplayer
         
         //! Set to false when deactivating or otherwise not to be included in hierarchy considerations.
         bool m_isHierarchyEnabled = true;
+
+        friend class HierarchyBenchmarkBase;
     };
 }

Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h

@@ -49,5 +49,13 @@ namespace Multiplayer
         //! Sets the state of connection whether update messages can be sent or not.
         //! @param canSendUpdates the state value
         virtual void SetCanSendUpdates(bool canSendUpdates) = 0;
+
+        //! Fetches the state of connection whether handshake logic has completed
+        //! @return true if handshake has completed
+        virtual bool DidHandshake() const = 0;
+
+        //! Sets the state of connection whether handshake logic has completed
+        //! @param didHandshake if handshake logic has completed
+        virtual void SetDidHandshake(bool didHandshake) = 0;
     };
 }

Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h

@@ -48,6 +48,7 @@ namespace Multiplayer
     using NotifyClientMigrationEvent = AZ::Event<AzNetworking::ConnectionId, const HostId&, uint64_t, ClientInputId, NetEntityId>;
     using NotifyEntityMigrationEvent = AZ::Event<const ConstNetworkEntityHandle&, const HostId&>;
     using ConnectionAcquiredEvent = AZ::Event<MultiplayerAgentDatum>;
+    using ServerAcceptanceReceivedEvent = AZ::Event<>;
     using SessionInitEvent = AZ::Event<AzNetworking::INetworkInterface*>;
     using SessionShutdownEvent = AZ::Event<AzNetworking::INetworkInterface*>;
 
@@ -122,6 +123,10 @@ namespace Multiplayer
         //! @param handler The ConnectionAcquiredEvent Handler to add
         virtual void AddConnectionAcquiredHandler(ConnectionAcquiredEvent::Handler& handler) = 0;
 
+        //! Adds a ServerAcceptanceReceived Handler which is invoked when the client receives the accept packet from the server.
+        //! @param handler The ServerAcceptanceReceived Handler to add
+        virtual void AddServerAcceptanceReceivedHandler(ServerAcceptanceReceivedEvent::Handler& handler) = 0;
+
         //! Adds a SessionInitEvent Handler which is invoked when a new network session starts.
         //! @param handler The SessionInitEvent Handler to add
         virtual void AddSessionInitHandler(SessionInitEvent::Handler& handler) = 0;