engage-engine 1.236.90760003 → 1.240.90800005

package/include/ConfigurationObjects.h

@@ -1085,7 +1085,10 @@ namespace AppConfigurationObjects
             bptAppBinary                    = 3,
 
             /** @brief Biometrics payload. Used to send biometric series data. <a href="https://github.com/rallytac/pub/wiki/Engage-Human-Biometrics" target="_blank">See WIKI post for more info</a> */
-            bptEngageBinaryHumanBiometrics  = 4
+            bptEngageBinaryHumanBiometrics  = 4,
+
+            /** @brief The payload is MIME-encoded as per RFC 2045 */
+            bptAppMimeMessage               = 5
         } PayloadType_t;
 
         /** @brief [Optional, Default : 0] Size of the payload */
@@ -1863,6 +1866,46 @@ namespace AppConfigurationObjects
         getOptional<Power>("power", p.power, j);
     }
 
+    /**
+     * @brief Network Transmission Priority.
+     *
+     *   Priority to set on the packets in order for the network to optimize routing of the packets
+     */
+    typedef enum
+    {
+        /** @brief best effort */
+        priBestEffort   = 0,
+
+        /** @brief signaling */
+        priSignaling    = 1,
+
+        /** @brief video */
+        priVideo        = 2,
+
+        /** @brief voice */
+        priVoice        = 3
+    } TxPriority_t;
+
+    /**
+     * @brief Address family resolution policy
+     *
+     *   Defines the policy on how to resolve/prefer IPv4 vs IPv6 names
+     */
+    typedef enum
+    {
+        /** @brief IPv4 only */
+        arpIpv4Only       = 4,
+
+        /** @brief IPv6 only */
+        arpIpv6Only       = 6,
+
+        /** @brief IPv4 then IPv6 */
+        arpIpv4ThenIpv6   = 46,
+
+        /** @brief IPv6 then IPv4 */
+        arpIpv6ThenIpv4   = 64
+    } AddressResolutionPolicy_t;
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(NetworkTxOptions)
     /**
@@ -1882,27 +1925,6 @@ namespace AppConfigurationObjects
         IMPLEMENT_JSON_DOCUMENTATION(NetworkTxOptions)
 
     public:
-
-        /**
-         * @brief Network Transmission Priority.
-         *
-         *   Priority to set on the packets in order for the network to optimize routing of the packets
-         */
-        typedef enum
-        {
-            /** @brief best effort */
-            priBestEffort   = 0,
-
-            /** @brief signaling */
-            priSignaling    = 1,
-
-            /** @brief video */
-            priVideo        = 2,
-
-            /** @brief voice */
-            priVoice        = 3
-        } TxPriority_t;
-
         /** @brief [Optional, Default: @ref priVoice] Transmission priority. This has meaning on some operating systems based on how their IP stack operates.  It may or may not affect final packet marking. */
         TxPriority_t    priority;
 
@@ -1939,7 +1961,7 @@ namespace AppConfigurationObjects
     static void from_json(const nlohmann::json& j, NetworkTxOptions& p)
     {
         p.clear();
-        getOptional<NetworkTxOptions::TxPriority_t>("priority", p.priority, j, NetworkTxOptions::priVoice);
+        getOptional<TxPriority_t>("priority", p.priority, j, TxPriority_t::priVoice);
         getOptional<int>("ttl", p.ttl, j, 1);
     }
 
@@ -1985,10 +2007,22 @@ namespace AppConfigurationObjects
     static void from_json(const nlohmann::json& j, TcpNetworkTxOptions& p)
     {
         p.clear();
-        getOptional<NetworkTxOptions::TxPriority_t>("priority", p.priority, j, NetworkTxOptions::priVoice);
+        getOptional<TxPriority_t>("priority", p.priority, j, TxPriority_t::priVoice);
         getOptional<int>("ttl", p.ttl, j, -1);
     }
 
+    typedef enum
+    {
+        /** @brief Unspecified */
+        ifIpUnspec             = 0,
+
+        /** @brief IPv4 */
+        ifIp4                  = 4,
+
+        /** @brief IPv6 */
+        ifIp6                  = 6
+    } IpFamilyType_t;
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(NetworkAddress)
     /**
@@ -2105,6 +2139,22 @@ namespace AppConfigurationObjects
         getOptional<NetworkAddress>("tx", p.tx, j);
     }
 
+    /** @brief Enum describing restriction types. */
+    typedef enum
+    {
+        /** @brief Registration for groups is allowed by default */
+        graptPermissive = 0,
+
+        /** @brief Registration for groups is NOT allowed by default - requires definitive access through something like a whitelist*/
+        graptStrict = 1
+    } GroupRestrictionAccessPolicyType_t;
+
+    static bool isValidGroupRestrictionAccessPolicyType(GroupRestrictionAccessPolicyType_t t)
+    {
+        return (t == GroupRestrictionAccessPolicyType_t::graptPermissive ||
+                t == GroupRestrictionAccessPolicyType_t::graptStrict );
+    }
+
     /** @brief Enum describing restriction types. */
     typedef enum
     {
@@ -2125,6 +2175,43 @@ namespace AppConfigurationObjects
                 t == RestrictionType_t::rtBlacklist );
     }
 
+    /** @brief Enum describing restriction element types. */
+    typedef enum
+    {
+        /** @brief A literal group ID */
+        retGroupId = 0,
+
+        /** @brief Elements are group ID regex patterns */
+        retGroupIdPattern = 1,
+
+        /** @brief Elements are generic access tags regex patterns */
+        retGenericAccessTagPattern = 2,
+
+        /** @brief Elements are X.509 certificate serial number regex patterns */
+        retCertificateSerialNumberPattern = 3,
+
+        /** @brief Elements are X.509 certificate fingerprint regex patterns */
+        retCertificateFingerprintPattern = 4,
+
+        /** @brief Elements are X.509 certificate subject regex patterns */
+        retCertificateSubjectPattern = 5,
+
+        /** @brief Elements are X.509 certificate issuer regex patterns */
+        retCertificateIssuerPattern = 6
+    } RestrictionElementType_t;    
+
+    static bool isValidRestrictionElementType(RestrictionElementType_t t)
+    {
+        return (t == RestrictionElementType_t::retGroupId ||
+                t == RestrictionElementType_t::retGroupIdPattern ||
+                t == RestrictionElementType_t::retGenericAccessTagPattern ||
+                t == RestrictionElementType_t::retCertificateSerialNumberPattern ||
+                t == RestrictionElementType_t::retCertificateFingerprintPattern ||
+                t == RestrictionElementType_t::retCertificateSubjectPattern ||
+                t == RestrictionElementType_t::retCertificateIssuerPattern);
+    }
+
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(NetworkAddressRestrictionList)
     /**
@@ -2196,12 +2283,16 @@ namespace AppConfigurationObjects
         /** @brief Type indicating how the elements are to be treated **/
         RestrictionType_t                   type;
 
+        /** @brief Type indicating what kind of data each element contains **/
+        RestrictionElementType_t            elementsType;
+
         /** @brief List of elements */
-        std::vector<std::string>     elements;
+        std::vector<std::string>            elements;
 
         StringRestrictionList()
         {
             type = RestrictionType_t::rtUndefined;
+            elementsType = RestrictionElementType_t::retGroupId;
             clear();
         }
 
@@ -2215,6 +2306,7 @@ namespace AppConfigurationObjects
     {
         j = nlohmann::json{
             TOJSON_IMPL(type),
+            TOJSON_IMPL(elementsType),
             TOJSON_IMPL(elements)
         };
     }
@@ -2222,6 +2314,7 @@ namespace AppConfigurationObjects
     {
         p.clear();
         getOptional<RestrictionType_t>("type", p.type, j, RestrictionType_t::rtUndefined);
+        getOptional<RestrictionElementType_t>("elementsType", p.elementsType, j, RestrictionElementType_t::retGroupId);
         getOptional<std::vector<std::string>>("elements", p.elements, j);
     }
 
@@ -2842,6 +2935,79 @@ namespace AppConfigurationObjects
         getOptional("extra", p.extra, j);
     }
 
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(AudioGate)
+    /**
+     * @brief Description of an audio gate
+     *
+     * Helper C++ class to serialize and de-serialize AudioGate JSON.
+     *
+     * Example: @include[doc] examples/AudioGate.json
+     *
+     */
+    class AudioGate : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(AudioGate)
+
+    public:
+        /** @brief [Optional.  Default: false]  Enables the audio gate if true */
+        bool            enabled;
+
+        /** @brief [Optional.  Default: false]  Use voice activity detection rather than audio energy */
+        bool            useVad;
+
+        /** @brief [Optional.  Default: 1500]  Hang timer in milliseconds */
+        uint32_t        hangMs;
+
+        /** @brief [Optional.  Default: 25]  Number of 10ms history samples to gather before calculating the noise floor - ignored if useVad is true */
+        uint32_t        windowMin;
+
+        /** @brief [Optional.  Default: 125]  Maximum number of 10ms history samples - ignored if useVad is true */        
+        uint32_t        windowMax;
+
+        /** @brief [Optional.  Default: 1.75]  Coefficient by which to multiply the current history average to determine the floor - ignored if useVad is true */
+        double          coefficient;
+
+
+        AudioGate()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            enabled = false;
+            useVad = false;
+            hangMs = 1500;
+            windowMin = 25;
+            windowMax = 125;
+            coefficient = 1.75;
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const AudioGate& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(enabled),
+            TOJSON_IMPL(useVad),
+            TOJSON_IMPL(hangMs),
+            TOJSON_IMPL(windowMin),
+            TOJSON_IMPL(windowMax),
+            TOJSON_IMPL(coefficient)            
+        };
+    }
+    static void from_json(const nlohmann::json& j, AudioGate& p)
+    {
+        p.clear();
+        getOptional<bool>("enabled", p.enabled, j, false);
+        getOptional<bool>("useVad", p.useVad, j, false);
+        getOptional<uint32_t>("hangMs", p.hangMs, j, 1500);
+        getOptional<uint32_t>("windowMin", p.windowMin, j, 25);
+        getOptional<uint32_t>("windowMax", p.windowMax, j, 125);
+        getOptional<double>("coefficient", p.coefficient, j, 1.75);
+    }    
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(TxAudio)
     /**
@@ -3018,6 +3184,9 @@ namespace AppConfigurationObjects
             ctMelpe2400     = 52
         } TxCodec_t;
 
+        /** @brief [Optional, Default: true] Audio transmission is enabled */
+        bool            enabled;
+
         /** @brief [Optional, Default: @ref ctOpus8000] Specifies the Codec Type to use for the transmission. See @ref TxCodec_t for all codec types */
         TxCodec_t       encoder;
 
@@ -3088,6 +3257,7 @@ namespace AppConfigurationObjects
 
         void clear()
         {
+            enabled = true;
             encoder = TxAudio::TxCodec_t::ctUnknown;
             encoderName.clear();
             framingMs = 60;
@@ -3110,6 +3280,7 @@ namespace AppConfigurationObjects
     static void to_json(nlohmann::json& j, const TxAudio& p)
     {
         j = nlohmann::json{
+            TOJSON_IMPL(enabled),
             TOJSON_IMPL(encoder),
             TOJSON_IMPL(encoderName),
             TOJSON_IMPL(framingMs),
@@ -3132,6 +3303,7 @@ namespace AppConfigurationObjects
     static void from_json(const nlohmann::json& j, TxAudio& p)
     {
         p.clear();
+        getOptional<bool>("enabled", p.enabled, j, true);        
         getOptional<TxAudio::TxCodec_t>("encoder", p.encoder, j, TxAudio::TxCodec_t::ctOpus8000);
         getOptional<std::string>("encoderName", p.encoderName, j, EMPTY_STRING);
         getOptional("framingMs", p.framingMs, j, 60);
@@ -3146,7 +3318,7 @@ namespace AppConfigurationObjects
         getOptional("resetRtpOnTx", p.resetRtpOnTx, j, true);
         getOptional("enableSmoothing", p.enableSmoothing, j, true);
         getOptional("dtx", p.dtx, j, false);
-        getOptional("smoothedHangTimeMs", p.smoothedHangTimeMs, j, 0);
+        getOptional("smoothedHangTimeMs", p.smoothedHangTimeMs, j, 0);        
 
         // internalKey is not serialized   
     }
@@ -3879,93 +4051,71 @@ namespace AppConfigurationObjects
     ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_SECURITY_CLASSIFICATION_LEVEL_TOO_HIGH = "SecurityClassificationLevelTooHigh";
     /** @brief The Rallypoint has denied the registration for no specific reason **/
     ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_GENERAL_DENIAL = "GeneralDenial";
-    /** @} */
 
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an access tag for the group **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NO_ACCESS_TAG = "NoAccessTag";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an access tag for the group **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_EXCLUDED_ACCESS_TAG = "ExcludedAccessTag";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an an approved serial number **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NO_SERIAL = "NoSerial";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate serial number has been excluded **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_EXCLUDED_SERIAL = "ExcludedSerial";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an an approved fingerprint **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NO_FINGERPRINT = "NoFingerprint";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate fingerprint has been excluded **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_EXCLUDED_FINGERPRINT = "ExcludedFingerprint";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an an approved subject **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NO_SUBJECT = "NoSubject";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate subject has been excluded **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_EXCLUDED_SUBJECT = "ExcludedSubject";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate does not have an an approved issuer **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NO_ISSUER = "NoIssuer";
+    /** @brief The Rallypoint denied the registration request because the far-end's certificate issuer has been excluded **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_EXCLUDED_ISSUER = "ExcludedIssuer";
+    /** @brief The Rallypoint denied the registration request because the far-end does not appear in any whitelist criteria **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_NOT_ON_WHITELIST = "NotOnWhitelist";
+    /** @brief The Rallypoint denied the registration request because the far-end does appears in blackist criteria **/
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *GROUP_DISCONNECTED_REASON_ON_BLACKLIST = "OnBlacklist";
 
-    //-----------------------------------------------------------
-    JSON_SERIALIZED_CLASS(GroupSatPaq)
-    /**
-     * @brief Configuration for the optional SatPaq transport functionality for Group.
-     *
-     * Helper C++ class to serialize and de-serialize GroupSatPaq JSON
+    /** @} */
+
+    /** @addtogroup OID IANA-type object identifiers
      *
-     * Example: @include[doc] examples/GroupSatPaq.json
+     * Object Identifiers we commonly use
      *
-     * @see ConfigurationObjects::Group
+     *  @{
      */
-    class GroupSatPaq : public ConfigurationObjectBase
-    {
-        IMPLEMENT_JSON_SERIALIZATION()
-        IMPLEMENT_JSON_DOCUMENTATION(GroupSatPaq)
-
-    public:
-        /** @brief [Optional, Default: false] Enables SatPaq feature. */
-        bool                        enabled;
-
-        /** @brief The sender ID. */
-        uint16_t                    senderId;
-
-        /** @brief The talkgroup ID. */
-        uint8_t                     talkgroupId;
-
-        GroupSatPaq()
-        {
-            clear();
-        }
-
-        void clear()
-        {
-            enabled = false;
-            senderId = 0;
-            talkgroupId = 0;
-        }
-    };
-
-    static void to_json(nlohmann::json& j, const GroupSatPaq& p)
-    {
-        j = nlohmann::json{
-            TOJSON_IMPL(enabled),
-            TOJSON_IMPL(senderId),
-            TOJSON_IMPL(talkgroupId)
-        };
-    }
-    static void from_json(const nlohmann::json& j, GroupSatPaq& p)
-    {
-        p.clear();
-        getOptional<bool>("enabled", p.enabled, j, false);
-        getOptional<uint16_t>("senderId", p.senderId, j, 0);
-        getOptional<uint8_t>("talkgroupId", p.talkgroupId, j, 0);
-    }
-
+    /** @brief Rally Tactical Systems' PEN as assigned by IANA */
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *OID_RTS_PEM = "58217";
+    /** @brief The link to the Rallypoint is down */
+    ENGAGE_IGNORE_COMPILER_UNUSED_WARNING static const char *OID_RTS_CERT_SUBJ_ACCESS_TAGS = "1.3.6.1.4.1.58217.1";    
+    /** @} */
 
 
     //-----------------------------------------------------------
-    JSON_SERIALIZED_CLASS(GroupLynQPro)
+    JSON_SERIALIZED_CLASS(GroupAppTransport)
     /**
-     * @brief Configuration for the optional LynQ Pro transport functionality for Group.
+     * @brief Configuration for the optional custom transport functionality for Group.
      *
-     * Helper C++ class to serialize and de-serialize GroupLynQPro JSON
+     * Helper C++ class to serialize and de-serialize GroupAppTransport JSON
      *
-     * Example: @include[doc] examples/GroupLynQPro.json
+     * Example: @include[doc] examples/GroupAppTransport.json
      *
      * @see ConfigurationObjects::Group
      */
-    class GroupLynQPro : public ConfigurationObjectBase
+    class GroupAppTransport : public ConfigurationObjectBase
     {
         IMPLEMENT_JSON_SERIALIZATION()
-        IMPLEMENT_JSON_DOCUMENTATION(GroupLynQPro)
+        IMPLEMENT_JSON_DOCUMENTATION(GroupAppTransport)
 
     public:
-        /** @brief [Optional, Default: false] Enables SatPaq feature. */
+        /** @brief [Optional, Default: false] Enables custom feature. */
         bool                        enabled;
 
-        /** @brief The sender ID. */
-        uint16_t                    senderId;
-
-        /** @brief The talkgroup ID. */
-        uint8_t                     talkgroupId;
+        /** @brief The id/name of the transport. This must match the id/name supplied when registering the app transport.*/
+        std::string                 id;
 
-        GroupLynQPro()
+        GroupAppTransport()
         {
             clear();
         }
@@ -3973,25 +4123,22 @@ namespace AppConfigurationObjects
         void clear()
         {
             enabled = false;
-            senderId = 0;
-            talkgroupId = 0;
+            id.clear();
         }
     };
 
-    static void to_json(nlohmann::json& j, const GroupLynQPro& p)
+    static void to_json(nlohmann::json& j, const GroupAppTransport& p)
     {
         j = nlohmann::json{
             TOJSON_IMPL(enabled),
-            TOJSON_IMPL(senderId),
-            TOJSON_IMPL(talkgroupId)
+            TOJSON_IMPL(id)
         };
     }
-    static void from_json(const nlohmann::json& j, GroupLynQPro& p)
+    static void from_json(const nlohmann::json& j, GroupAppTransport& p)
     {
         p.clear();
         getOptional<bool>("enabled", p.enabled, j, false);
-        getOptional<uint16_t>("senderId", p.senderId, j, 0);
-        getOptional<uint8_t>("talkgroupId", p.talkgroupId, j, 0);
+        getOptional<std::string>("id", p.id, j);
     }
 
     //-----------------------------------------------------------
@@ -4389,6 +4536,16 @@ namespace AppConfigurationObjects
             bomLanguageTranslation      = 3
         } BridgingOpMode_t;
 
+        /** @brief Enum describing the alias generation policy. */
+        typedef enum
+        {
+            /** @brief Use the anonymousAlias if present */
+            iagpAnonymousAlias          = 0,
+
+            /** @brief Generate hex representation of SSRC. */
+            iagpSsrcInHex               = 1
+        } InboundAliasGenerationPolicy_t;
+
         /** @brief Specifies the group type (see @ref Type_t). */
         Type_t                                  type;
 
@@ -4500,14 +4657,8 @@ namespace AppConfigurationObjects
         /** @brief [Optional] Alias to use for inbound streams that do not have an alias component  */
         std::string                             anonymousAlias;
 
-        /** @brief [Optional] Settings necessary if the group is transported via the SatPaq protocol  */
-        GroupSatPaq                             satPaq;
-
-        /** @brief [Optional] Settings necessary if the group is transported via the LynQPro protocol  */
-        GroupLynQPro                            lynqPro;
-
-        /** @brief [Optional] The name of the registered transport to use  */
-        std::string                             transportName;
+        /** @brief [Optional] Settings necessary if the group is transported via an application-supplied custom transport  */
+        GroupAppTransport                       appTransport;
 
         /** @brief [Optional, Default: false] Allows for processing of looped back packets - primarily meant for debugging  */
         bool                                    allowLoopback;
@@ -4548,6 +4699,15 @@ namespace AppConfigurationObjects
         /** @brief Details for capture of transmitted packets  */
         PacketCapturer                          txCapture;
 
+        /** @brief [Optional, Default: 66] The RTP payload type to be used for blobs sent over RTP (see BlobInfo) */
+        uint16_t                                blobRtpPayloadType;
+
+        /** @brief [Optional, Default: iagpAnonymousAlias]  */
+        InboundAliasGenerationPolicy_t          inboundAliasGenerationPolicy;
+
+        /** @brief [Optional] Inbound gating of audio - only audio allowed through by the gate will be processed */
+        AudioGate                               gateIn;
+
         Group()
         {
             clear();
@@ -4600,9 +4760,7 @@ namespace AppConfigurationObjects
             anonymousAlias.clear();
             lbCrypto = false;
 
-            satPaq.clear();
-            lynqPro.clear();
-            transportName.clear();
+            appTransport.clear();
             allowLoopback = false;
 
             rtpProfile.clear();
@@ -4624,6 +4782,10 @@ namespace AppConfigurationObjects
 
             rxCapture.clear();
             txCapture.clear();
+
+            blobRtpPayloadType = 66;
+            inboundAliasGenerationPolicy = iagpAnonymousAlias;
+            gateIn.clear();
         }
     };
 
@@ -4666,9 +4828,7 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(stickyTidHangSecs),
             TOJSON_IMPL(anonymousAlias),
             TOJSON_IMPL(lbCrypto),
-            TOJSON_IMPL(satPaq),
-            TOJSON_IMPL(lynqPro),
-            TOJSON_IMPL(transportName),
+            TOJSON_IMPL(appTransport),
             TOJSON_IMPL(allowLoopback),
             TOJSON_IMPL(rangerPackets),
 
@@ -4685,7 +4845,13 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(synVoice),
 
             TOJSON_IMPL(rxCapture),
-            TOJSON_IMPL(txCapture)
+            TOJSON_IMPL(txCapture),
+
+            TOJSON_IMPL(blobRtpPayloadType),
+
+            TOJSON_IMPL(inboundAliasGenerationPolicy),
+
+            TOJSON_IMPL(gateIn)
         };
 
         TOJSON_BASE_IMPL();
@@ -4749,9 +4915,7 @@ namespace AppConfigurationObjects
         getOptional<int>("stickyTidHangSecs", p.stickyTidHangSecs, j, 10);
         getOptional<std::string>("anonymousAlias", p.anonymousAlias, j);
         getOptional<bool>("lbCrypto", p.lbCrypto, j, false);
-        getOptional<GroupSatPaq>("satPaq", p.satPaq, j);
-        getOptional<GroupLynQPro>("lynqPro", p.lynqPro, j);
-        getOptional<std::string>("transportName", p.transportName, j);
+        getOptional<GroupAppTransport>("appTransport", p.appTransport, j);
         getOptional<bool>("allowLoopback", p.allowLoopback, j, false);
         getOptionalWithIndicator<RtpProfile>("rtpProfile", p.rtpProfile, j, &p._wasDeserialized_rtpProfile);
         getOptional<RangerPackets>("rangerPackets", p.rangerPackets, j);
@@ -4766,6 +4930,12 @@ namespace AppConfigurationObjects
         getOptional<PacketCapturer>("rxCapture", p.rxCapture, j);
         getOptional<PacketCapturer>("txCapture", p.txCapture, j);
 
+        getOptional<uint16_t>("blobRtpPayloadType", p.blobRtpPayloadType, j, 66);
+
+        getOptional<Group::InboundAliasGenerationPolicy_t>("inboundAliasGenerationPolicy", p.inboundAliasGenerationPolicy, j, Group::InboundAliasGenerationPolicy_t::iagpAnonymousAlias);
+
+        getOptional<AudioGate>("gateIn", p.gateIn, j);
+
         FROMJSON_BASE_IMPL();
     }
 
@@ -5010,20 +5180,17 @@ namespace AppConfigurationObjects
         /** @brief [Optional, false] Enables UDP streaming if the RP supports it */
         bool                                enabled;
 
-        /** @brief [Optional, EnginePolicyNetworking::defaultNic] Name of NIC to bind to - uses Engine defaultNic if empty */
-        std::string                         nic;
-
         /** @brief [Optional, 0] The port to be used for Rallypoint UDP streaming.  A value of 0 will result in an ephemeral port being assigned.*/
-        int                                port;
+        int                                 port;
 
-        /** @brief Optional, Default: 10] Seconds interval at which to send UDP keepalives to Rallypoints.  This is important for NAT "hole-punching". */
-        int                                keepAliveIntervalSecs;
+        /** @brief Optional, Default: 15] Seconds interval at which to send UDP keepalives to Rallypoints.  This is important for NAT "hole-punching". */
+        int                                 keepaliveIntervalSecs;
 
         /** @brief [Optional, Default: @ref priVoice] Transmission priority. This has meaning on some operating systems based on how their IP stack operates.  It may or may not affect final packet marking. */
-        NetworkTxOptions::TxPriority_t     priority;
+        TxPriority_t                        priority;
 
         /** @brief [Optional, Default: 64] Time to live or hop limit is a mechanism that limits the lifespan or lifetime of data in a network. TTL prevents a data packet from circulating indefinitely. */
-        int                                ttl;
+        int                                 ttl;
 
         EngineNetworkingRpUdpStreaming()
         {
@@ -5033,9 +5200,9 @@ namespace AppConfigurationObjects
         void clear()
         {
             enabled = false;
-            nic.clear();
-            keepAliveIntervalSecs = 10;
-            priority = NetworkTxOptions::priVoice;
+            port = 0;
+            keepaliveIntervalSecs = 15;
+            priority = TxPriority_t::priVoice;
             ttl = 64;
         }
 
@@ -5048,9 +5215,8 @@ namespace AppConfigurationObjects
     {
         j = nlohmann::json{
             TOJSON_IMPL(enabled),
-            TOJSON_IMPL(nic),
             TOJSON_IMPL(port),
-            TOJSON_IMPL(keepAliveIntervalSecs),
+            TOJSON_IMPL(keepaliveIntervalSecs),
             TOJSON_IMPL(priority),
             TOJSON_IMPL(ttl)
         };
@@ -5059,10 +5225,9 @@ namespace AppConfigurationObjects
     {
         p.clear();
         getOptional<bool>("enabled", p.enabled, j, false);
-        getOptional<std::string>("nic", p.nic, j, EMPTY_STRING);
         getOptional<int>("port", p.port, j, 0);
-        getOptional<int>("keepAliveIntervalSecs", p.keepAliveIntervalSecs, j, 10);
-        getOptional<NetworkTxOptions::TxPriority_t>("priority", p.priority, j, NetworkTxOptions::priVoice);
+        getOptional<int>("keepaliveIntervalSecs", p.keepaliveIntervalSecs, j, 15);
+        getOptional<TxPriority_t>("priority", p.priority, j, TxPriority_t::priVoice);
         getOptional<int>("ttl", p.ttl, j, 64);
     }
 
@@ -5083,25 +5248,28 @@ namespace AppConfigurationObjects
 
     public:
         /** @brief The default network interface card the Engage Engine should bind to. */
-        std::string         defaultNic;
+        std::string                         defaultNic;
 
         /** @brief [Optional, Default: 8] Number of seconds elapsed between RX of multicast packets before an IGMP rejoin is made */
-        int                 multicastRejoinSecs;
+        int                                 multicastRejoinSecs;
 
         /** @brief [Optional, Default: 60000] Milliseconds between sending Rallypoint round-trip test requests */
-        int                 rallypointRtTestIntervalMs;
+        int                                 rallypointRtTestIntervalMs;
 
         /** @brief [Optional, Default: false] If true, logs RTP jitter buffer statistics periodically */
-        bool                logRtpJitterBufferStats;
+        bool                                logRtpJitterBufferStats;
 
         /** @brief [Optional, Default: false] Overrides/cancels group-level multicast failover if set to true */
-        bool                preventMulticastFailover;        
+        bool                                preventMulticastFailover;        
 
         /** @brief [Optional] Configuration for UDP streaming */
-        EngineNetworkingRpUdpStreaming  rpUdpStreaming;
+        EngineNetworkingRpUdpStreaming      rpUdpStreaming;
 
         /** @brief [Optional] Configuration for RTP profile */
-        RtpProfile          rtpProfile;
+        RtpProfile                          rtpProfile;
+
+        /** @brief [Optional, Default 64] Address resolution policy */
+        AddressResolutionPolicy_t         addressResolutionPolicy;
 
         EnginePolicyNetworking()
         {
@@ -5115,6 +5283,7 @@ namespace AppConfigurationObjects
             rallypointRtTestIntervalMs = 60000;
             logRtpJitterBufferStats = false;
             preventMulticastFailover = false;
+            addressResolutionPolicy = AddressResolutionPolicy_t::arpIpv6ThenIpv4;
 
             rpUdpStreaming.clear();
             rtpProfile.clear();
@@ -5132,7 +5301,8 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(preventMulticastFailover),
 
             TOJSON_IMPL(rpUdpStreaming),
-            TOJSON_IMPL(rtpProfile)
+            TOJSON_IMPL(rtpProfile),
+            TOJSON_IMPL(addressResolutionPolicy)
         };
     }
     static void from_json(const nlohmann::json& j, EnginePolicyNetworking& p)
@@ -5146,6 +5316,7 @@ namespace AppConfigurationObjects
 
         getOptional<EngineNetworkingRpUdpStreaming>("rpUdpStreaming", p.rpUdpStreaming, j);
         getOptional<RtpProfile>("rtpProfile", p.rtpProfile, j);
+        getOptional<AddressResolutionPolicy_t>("addressResolutionPolicy", p.addressResolutionPolicy, j, AddressResolutionPolicy_t::arpIpv6ThenIpv4);
     }
 
     //-----------------------------------------------------------
@@ -5498,6 +5669,9 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default: true] Enables audio processing */
         bool                enabled;
 
+        /** @brief [Optional, Default: true] Enables local machine hardware audio */
+        bool                hardwareEnabled;
+
         /** @brief [Optional, Default: 16000] Internal sampling rate - 8000 or 16000 */
         int                 internalRate;
 
@@ -5536,6 +5710,7 @@ namespace AppConfigurationObjects
         void clear()
         {
             enabled = true;
+            hardwareEnabled = true;
             internalRate = 16000;
             internalChannels = 2;
             muteTxOnTx = false;
@@ -5553,6 +5728,7 @@ namespace AppConfigurationObjects
     {
         j = nlohmann::json{
             TOJSON_IMPL(enabled),
+            TOJSON_IMPL(hardwareEnabled),
             TOJSON_IMPL(internalRate),
             TOJSON_IMPL(internalChannels),
             TOJSON_IMPL(muteTxOnTx),
@@ -5569,6 +5745,7 @@ namespace AppConfigurationObjects
     {
         p.clear();
         getOptional<bool>("enabled", p.enabled, j, true);
+        getOptional<bool>("hardwareEnabled", p.hardwareEnabled, j, true);
         FROMJSON_IMPL(internalRate, int, 16000);
         FROMJSON_IMPL(internalChannels, int, 2);
 
@@ -5820,6 +5997,61 @@ namespace AppConfigurationObjects
         FROMJSON_IMPL(reclaimSpace, bool, false);
     }
 
+
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(SecureSignature)
+    /**
+    * @brief Configuration for a secure signature.
+    *
+    * Helper C++ class to serialize and de-serialize SecureSignature JSON
+    *
+    * Example: @include[doc] examples/SecureSignature.json
+    */
+    class SecureSignature : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(SecureSignature)
+
+    public:
+
+        /** @brief Contains the PEM-formatted text of the certificate */
+        std::string         certificate;
+
+        // /** @brief Contains the PEM-formatted text of the certificate's public key */
+        //std::string         publicKey;
+
+        /** @brief Contains the signature */
+        std::string         signature;
+
+        SecureSignature()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            certificate.clear();
+            //publicKey.clear();
+            signature.clear();
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const SecureSignature& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(certificate),
+            //TOJSON_IMPL(publicKey),
+            TOJSON_IMPL(signature)
+        };
+    }
+    static void from_json(const nlohmann::json& j, SecureSignature& p)
+    {
+        p.clear();
+        FROMJSON_IMPL(certificate, std::string, EMPTY_STRING);
+        //FROMJSON_IMPL(publicKey, std::string, EMPTY_STRING);
+        FROMJSON_IMPL(signature, std::string, EMPTY_STRING);
+    }
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(NamedAudioDevice)
     class NamedAudioDevice : public ConfigurationObjectBase
@@ -7062,6 +7294,9 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default: 0 - OS platform default] Connection timeout in seconds to the peer */
         int                      connectionTimeoutSecs;
 
+        /** @brief Internal enablement setting. */
+        bool                    forceIsMeshLeaf;
+
         RallypointPeer()
         {
             clear();
@@ -7074,6 +7309,7 @@ namespace AppConfigurationObjects
             host.clear();
             certificate.clear();
             connectionTimeoutSecs = 0;
+            forceIsMeshLeaf = false;
         }
     };
 
@@ -7084,7 +7320,8 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(enabled),
             TOJSON_IMPL(host),
             TOJSON_IMPL(certificate),
-            TOJSON_IMPL(connectionTimeoutSecs)
+            TOJSON_IMPL(connectionTimeoutSecs),
+            TOJSON_IMPL(forceIsMeshLeaf)
         };
     }
     static void from_json(const nlohmann::json& j, RallypointPeer& p)
@@ -7095,6 +7332,7 @@ namespace AppConfigurationObjects
         getOptional<NetworkAddress>("host", p.host, j);
         getOptional<SecurityCertificate>("certificate", p.certificate, j);
         getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 0);
+        getOptional<bool>("forceIsMeshLeaf", p.forceIsMeshLeaf, j, false);
     }
 
     //-----------------------------------------------------------
@@ -7672,6 +7910,52 @@ namespace AppConfigurationObjects
     }    
 
 
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(RallypointUdpStreamingIpvX)
+    /**
+     * @brief Streaming configuration for RP clients
+     *
+     * Example: @include[doc] examples/RallypointUdpStreamingIpvX.json
+     *
+     */
+    class RallypointUdpStreamingIpvX : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(RallypointUdpStreamingIpvX)
+
+    public:
+        /** @brief [Optional, Default true] If true, enables UDP streaming for vX. */
+        bool                                    enabled;
+
+        /** @brief Network address for external entities to transmit to.  Defaults to the address of the local interface and port 7444 */
+        NetworkAddress                          external;
+
+        RallypointUdpStreamingIpvX()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            enabled = true;            
+            external.clear();
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const RallypointUdpStreamingIpvX& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(enabled),
+            TOJSON_IMPL(external)
+        };
+    }
+    static void from_json(const nlohmann::json& j, RallypointUdpStreamingIpvX& p)
+    {
+        p.clear();
+        getOptional<bool>("enabled", p.enabled, j, true);        
+        getOptional<NetworkAddress>("external", p.external, j);
+    }    
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(RallypointUdpStreaming)
     /**
@@ -7690,20 +7974,45 @@ namespace AppConfigurationObjects
         typedef enum
         {
             /** @brief Unknown */
-            etUnknown,
+            ctUnknown                   = 0,
 
-            /** @brief Shared-key encryption */
-            etSharedKey
-        } EnvelopeType_t;
+            /** @brief Shared-key, AES256 full IV */
+            ctSharedKeyAes256FullIv     = 1,
 
-        /** @brief Specifies the streaming mode type (see @ref EnvelopeType_t). */
-        EnvelopeType_t                          envelopeType;
+            /** @brief Shared-key, AES256 indexed IV */
+            ctSharedKeyAes256IdxIv      = 2,
 
-        /** @brief Network address for listening */
-        NetworkAddress                          listen;
+            /** @brief Shared-key, ChaCha20 full IV */
+            ctSharedKeyChaCha20FullIv   = 3,
+
+            /** @brief Shared-key, ChaCha20 indexed IV */
+            ctSharedKeyChaCha20IdxIv    = 4
+        } CryptoType_t;
+
+        /** @brief [Optional, Default true] If true, enables UDP streaming unless turned off on a per-family basis. */
+        bool                                enabled;
+
+        /** @brief [Optional, Default ctSharedKeyAes256FullIv] The crypto method to be used */
+        CryptoType_t                        cryptoType;
+
+        /** @brief UDP port to listen on.  Default is 7444. */
+        int                                 listenPort;
+
+        /** @brief IPv4  */
+        RallypointUdpStreamingIpvX          ipv4;
+
+        /** @brief IPv6 */
+        RallypointUdpStreamingIpvX          ipv6;
+
+        /** @brief [Optional, Default: 15] Interval (seconds) at which to send UDP keepalives */
+        int                                 keepaliveIntervalSecs;
+
+        /** @brief [Optional, Default: @ref priVoice] Transmission priority. This has meaning on some operating systems based on how their IP stack operates.  It may or may not affect final packet marking. */
+        TxPriority_t                        priority;
+
+        /** @brief [Optional, Default: 64] Time to live or hop limit. */
+        int                                 ttl;
 
-        /** @brief Network address for external entities to transmit to */
-        NetworkAddress                          external;
 
         RallypointUdpStreaming()
         {
@@ -7712,27 +8021,42 @@ namespace AppConfigurationObjects
 
         void clear()
         {
-            envelopeType = etUnknown;
-            listen.clear();
-            external.clear();
+            enabled = true;
+            cryptoType = CryptoType_t::ctSharedKeyAes256FullIv;
+            listenPort = 7444;
+            ipv4.clear();
+            ipv6.clear();
+            keepaliveIntervalSecs = 15;
+            priority = TxPriority_t::priVoice;
+            ttl = 64;
         }
     };
 
     static void to_json(nlohmann::json& j, const RallypointUdpStreaming& p)
     {
         j = nlohmann::json{
-            TOJSON_IMPL(envelopeType),
-            TOJSON_IMPL(listen),
-            TOJSON_IMPL(external)
+            TOJSON_IMPL(enabled),
+            TOJSON_IMPL(cryptoType),
+            TOJSON_IMPL(listenPort),
+            TOJSON_IMPL(keepaliveIntervalSecs),
+            TOJSON_IMPL(ipv4),
+            TOJSON_IMPL(ipv6),
+            TOJSON_IMPL(priority),
+            TOJSON_IMPL(ttl)
         };
     }
     static void from_json(const nlohmann::json& j, RallypointUdpStreaming& p)
     {
         p.clear();
-        j.at("envelopeType").get_to(p.envelopeType);
-        j.at("listen").get_to(p.listen);
-        j.at("external").get_to(p.external);
-    }    
+        getOptional<bool>("enabled", p.enabled, j, true);
+        getOptional<RallypointUdpStreaming::CryptoType_t>("cryptoType", p.cryptoType, j, RallypointUdpStreaming::CryptoType_t::ctSharedKeyAes256FullIv);
+        getOptional<int>("listenPort", p.listenPort, j, 7444);
+        getOptional<int>("keepaliveIntervalSecs", p.keepaliveIntervalSecs, j, 15);
+        getOptional<RallypointUdpStreamingIpvX>("ipv4", p.ipv4, j);
+        getOptional<RallypointUdpStreamingIpvX>("ipv6", p.ipv6, j);
+        getOptional<TxPriority_t>("priority", p.priority, j, TxPriority_t::priVoice);
+        getOptional<int>("ttl", p.ttl, j, 64);
+    }
 
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(RallypointRpRtTimingBehavior)
@@ -7944,6 +8268,54 @@ namespace AppConfigurationObjects
         getOptional<std::vector<std::string>>("extraMeshes", p.extraMeshes, j);
     }
 
+
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(RallypointExtendedGroupRestriction)
+    /**
+     * @brief Defines settings for Rallypoint extended group restrictions
+     *
+     * Example: @include[doc] examples/RallypointExtendedGroupRestriction.json
+     *
+     */
+    class RallypointExtendedGroupRestriction : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(RallypointExtendedGroupRestriction)
+
+    public:
+        /** @brief Group ID */
+        std::string                             id;
+
+        /** @brief Restrictions */
+        std::vector<StringRestrictionList>      restrictions;
+
+        RallypointExtendedGroupRestriction()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            id.clear();
+            restrictions.clear();
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const RallypointExtendedGroupRestriction& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(id),
+            TOJSON_IMPL(restrictions)
+        };
+    }
+    static void from_json(const nlohmann::json& j, RallypointExtendedGroupRestriction& p)
+    {
+        p.clear();
+        getOptional<std::string>("id", p.id, j);
+        getOptional<std::vector<StringRestrictionList>>("restrictions", p.restrictions, j);
+    }
+
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(RallypointServer)
     /**
@@ -7959,7 +8331,7 @@ namespace AppConfigurationObjects
         IMPLEMENT_JSON_SERIALIZATION()
         IMPLEMENT_JSON_DOCUMENTATION(RallypointServer)
 
-    public:
+    public:        
         /** @brief [Optional] Settings for the FIPS crypto. */
         FipsCryptoSettings                          fipsCrypto;
     
@@ -7972,6 +8344,9 @@ namespace AppConfigurationObjects
         /** @brief TCP port to listen on.  Default is 7443. */
         int                                         listenPort;
 
+        /** @brief [Optional, Default IpFamilyType_t::ifIp4] Address familiy to be used for listening */
+        IpFamilyType_t                         ipFamily;
+
         /** @brief Name of the NIC to bind to for listening for incoming TCP connections. */
         std::string                                 interfaceName;
 
@@ -8056,6 +8431,12 @@ namespace AppConfigurationObjects
         /** @brief Group IDs to be restricted (inclusive or exclusive) */
         StringRestrictionList                       groupRestrictions;
 
+        /** @brief The policy employed to allow group registration */
+        GroupRestrictionAccessPolicyType_t          groupRestrictionAccessPolicyType;
+
+        /** @brief Extended group restrictions */
+        std::vector<RallypointExtendedGroupRestriction>       extendedGroupRestrictions;
+
         /** @brief Name to use for signalling a configuration check */
         std::string                                 configurationCheckSignalName;
 
@@ -8159,6 +8540,9 @@ namespace AppConfigurationObjects
             websocket.clear();
             nsm.clear();
             advertising.clear();
+            extendedGroupRestrictions.clear();
+            groupRestrictionAccessPolicyType = GroupRestrictionAccessPolicyType_t::graptPermissive;
+            ipFamily = IpFamilyType_t::ifIpUnspec;
         }
     };
 
@@ -8212,7 +8596,10 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(peerRtBehaviors),
             TOJSON_IMPL(websocket),
             TOJSON_IMPL(nsm),
-            TOJSON_IMPL(advertising)
+            TOJSON_IMPL(advertising),
+            TOJSON_IMPL(extendedGroupRestrictions),
+            TOJSON_IMPL(groupRestrictionAccessPolicyType),
+            TOJSON_IMPL(ipFamily)            
         };
     }
     static void from_json(const nlohmann::json& j, RallypointServer& p)
@@ -8266,6 +8653,9 @@ namespace AppConfigurationObjects
         getOptional<RallypointWebsocketSettings>("websocket", p.websocket, j);
         getOptional<NsmConfiguration>("nsm", p.nsm, j);
         getOptional<RallypointAdvertisingSettings>("advertising", p.advertising, j);
+        getOptional<std::vector<RallypointExtendedGroupRestriction>>("extendedGroupRestrictions", p.extendedGroupRestrictions, j);        
+        getOptional<GroupRestrictionAccessPolicyType_t>("groupRestrictionAccessPolicyType", p.groupRestrictionAccessPolicyType, j, GroupRestrictionAccessPolicyType_t::graptPermissive);
+        getOptional<IpFamilyType_t>("ipFamily", p.ipFamily, j, IpFamilyType_t::ifIpUnspec);
     }
 
     //-----------------------------------------------------------
@@ -8703,6 +9093,53 @@ namespace AppConfigurationObjects
         getOptional<std::vector<CertStoreCertificateElement>>("certificates", p.certificates, j);
     }
 
+    //-----------------------------------------------------------
+    JSON_SERIALIZED_CLASS(CertificateSubjectElement)
+    /**
+    * @brief Description of a certificate subject element
+    *
+    * Helper C++ class to serialize and de-serialize CertificateSubjectElement JSON
+    *
+    */
+    class CertificateSubjectElement : public ConfigurationObjectBase
+    {
+        IMPLEMENT_JSON_SERIALIZATION()
+        IMPLEMENT_JSON_DOCUMENTATION(CertificateSubjectElement)
+
+    public:
+        /** @brief Name */
+        std::string                                     name;
+
+        /** @brief Value */
+        std::string                                     value;
+
+        CertificateSubjectElement()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            name.clear();
+            value.clear();
+        }
+    };
+
+    static void to_json(nlohmann::json& j, const CertificateSubjectElement& p)
+    {
+        j = nlohmann::json{
+            TOJSON_IMPL(name),
+            TOJSON_IMPL(value)
+        };
+    }
+    static void from_json(const nlohmann::json& j, CertificateSubjectElement& p)
+    {
+        p.clear();
+        getOptional<std::string>("name", p.name, j, EMPTY_STRING);
+        getOptional<std::string>("value", p.value, j, EMPTY_STRING);
+    }
+
+
     //-----------------------------------------------------------
     JSON_SERIALIZED_CLASS(CertificateDescriptor)
     /**
@@ -8741,6 +9178,15 @@ namespace AppConfigurationObjects
         /** @brief Fingerprint */
         std::string                                     fingerprint;
 
+        /** @brief Array of subject elements */
+        std::vector<CertificateSubjectElement>          subjectElements;
+
+        /** @brief PEM version of the certificate */
+        std::string                                     certificatePem;
+
+        /** @brief PEM version of the public key */
+        std::string                                     publicKeyPem;
+
         CertificateDescriptor()
         {
             clear();
@@ -8756,6 +9202,9 @@ namespace AppConfigurationObjects
             notAfter.clear();
             serial.clear();
             fingerprint.clear();
+            subjectElements.clear();
+            certificatePem.clear();
+            publicKeyPem.clear();
         }
     };
 
@@ -8769,7 +9218,10 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(notBefore),
             TOJSON_IMPL(notAfter),
             TOJSON_IMPL(serial),
-            TOJSON_IMPL(fingerprint)
+            TOJSON_IMPL(fingerprint),
+            TOJSON_IMPL(subjectElements),
+            TOJSON_IMPL(certificatePem),
+            TOJSON_IMPL(publicKeyPem)
         };
     }
     static void from_json(const nlohmann::json& j, CertificateDescriptor& p)
@@ -8783,6 +9235,9 @@ namespace AppConfigurationObjects
         getOptional<std::string>("notAfter", p.notAfter, j, EMPTY_STRING);
         getOptional<std::string>("serial", p.serial, j, EMPTY_STRING);
         getOptional<std::string>("fingerprint", p.fingerprint, j, EMPTY_STRING);
+        getOptional<std::string>("certificatePem", p.certificatePem, j, EMPTY_STRING);
+        getOptional<std::string>("publicKeyPem", p.publicKeyPem, j, EMPTY_STRING);
+        getOptional<std::vector<CertificateSubjectElement>>("subjectElements", p.subjectElements, j);
     }
 
 
@@ -10790,8 +11245,7 @@ namespace AppConfigurationObjects
         Advertising::document();
         GroupPriorityTranslation::document();
         GroupTimeline::document();
-        GroupSatPaq::document();
-        GroupLynQPro::document();
+        GroupAppTransport::document();
         RtpProfile::document();
         Group::document();
         Mission::document();