Updating generated files (and minor code adjustment) for CME schema 8 changes:

2023-01-09 10:28:10 -05:00
1 parent 57ac54b6c5
commit 8a1ab0ba9e
@@ -162,9 +162,9 @@ map_cust_cti(api::orderman::CTICode code) {
   case CTI_CODE_CTI_CODE1:
      return CustOrderCapacity::Membertradingfortheirownaccount;
   case CTI_CODE_CTI_CODE2:
-      return CustOrderCapacity::Clearingfirmtradingforitsproprietaryaccount;
+      return CustOrderCapacity::Memberfirmtradingforitsproprietaryaccount;
   case CTI_CODE_CTI_CODE3:
-      return CustOrderCapacity::Membertradingforanothermember;
+      return CustOrderCapacity::Membertradingforanothermemberornonmember;
   case CTI_CODE_CTI_CODE4:
      return CustOrderCapacity::Allother;
   default:
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_AVGPXIND_H_
 #define _ILINKBINARY_AVGPXIND_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class AvgPxInd
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_BOOLEANFLAG_H_
 #define _ILINKBINARY_BOOLEANFLAG_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class BooleanFlag
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_BOOLEANNULL_H_
 #define _ILINKBINARY_BOOLEANNULL_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class BooleanNULL
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(330);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(521);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = BusinessReject521(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    BusinessReject521 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1935,8 +1942,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, BusinessReject521 _writer)
 {
-    BusinessReject521 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    BusinessReject521 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "BusinessReject521", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_CLEARINGACCTTYPE_H_
 #define _ILINKBINARY_CLEARINGACCTTYPE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ClearingAcctType
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_CMTAGIVEUPCD_H_
 #define _ILINKBINARY_CMTAGIVEUPCD_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class CmtaGiveUpCD
@@ -96,7 +32,7 @@ public:
    {
        GiveUp = static_cast<char>(71),
        SGXoffset = static_cast<char>(83),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(0x00)
    };

    static CmtaGiveUpCD::Value get(const char value)
@@ -105,7 +41,7 @@ public:
        {
            case static_cast<char>(71): return GiveUp;
            case static_cast<char>(83): return SGXoffset;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(0x00): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum CmtaGiveUpCD [E103]");
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_CUSTORDHANDLINST_H_
 #define _ILINKBINARY_CUSTORDHANDLINST_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class CustOrdHandlInst
@@ -100,7 +36,7 @@ public:
        AlgoEngine = static_cast<char>(72),
        DeskElectronic = static_cast<char>(87),
        ClientElectronic = static_cast<char>(89),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(48)
    };

    static CustOrdHandlInst::Value get(const char value)
@@ -113,7 +49,7 @@ public:
            case static_cast<char>(72): return AlgoEngine;
            case static_cast<char>(87): return DeskElectronic;
            case static_cast<char>(89): return ClientElectronic;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(48): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum CustOrdHandlInst [E103]");
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_CUSTORDERCAPACITY_H_
 #define _ILINKBINARY_CUSTORDERCAPACITY_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class CustOrderCapacity
@@ -95,8 +31,8 @@ public:
    enum Value
    {
        Membertradingfortheirownaccount = static_cast<std::uint8_t>(1),
-        Clearingfirmtradingforitsproprietaryaccount = static_cast<std::uint8_t>(2),
-        Membertradingforanothermember = static_cast<std::uint8_t>(3),
+        Memberfirmtradingforitsproprietaryaccount = static_cast<std::uint8_t>(2),
+        Membertradingforanothermemberornonmember = static_cast<std::uint8_t>(3),
        Allother = static_cast<std::uint8_t>(4),
        NULL_VALUE = static_cast<std::uint8_t>(255)
    };
@@ -106,8 +42,8 @@ public:
        switch (value)
        {
            case static_cast<std::uint8_t>(1): return Membertradingfortheirownaccount;
-            case static_cast<std::uint8_t>(2): return Clearingfirmtradingforitsproprietaryaccount;
-            case static_cast<std::uint8_t>(3): return Membertradingforanothermember;
+            case static_cast<std::uint8_t>(2): return Memberfirmtradingforitsproprietaryaccount;
+            case static_cast<std::uint8_t>(3): return Membertradingforanothermemberornonmember;
            case static_cast<std::uint8_t>(4): return Allother;
            case static_cast<std::uint8_t>(255): return NULL_VALUE;
        }
@@ -120,8 +56,8 @@ public:
        switch (value)
        {
            case Membertradingfortheirownaccount: return "Membertradingfortheirownaccount";
-            case Clearingfirmtradingforitsproprietaryaccount: return "Clearingfirmtradingforitsproprietaryaccount";
-            case Membertradingforanothermember: return "Membertradingforanothermember";
+            case Memberfirmtradingforitsproprietaryaccount: return "Memberfirmtradingforitsproprietaryaccount";
+            case Membertradingforanothermemberornonmember: return "Membertradingforanothermemberornonmember";
            case Allother: return "Allother";
            case NULL_VALUE: return "NULL_VALUE";
        }
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *lengthMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_DKREASON_H_
 #define _ILINKBINARY_DKREASON_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class DKReason
@@ -102,7 +38,7 @@ public:
        CalculationDifference = static_cast<char>(70),
        NoMatchingExecutionReport = static_cast<char>(71),
        Other = static_cast<char>(90),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(48)
    };

    static DKReason::Value get(const char value)
@@ -117,7 +53,7 @@ public:
            case static_cast<char>(70): return CalculationDifference;
            case static_cast<char>(71): return NoMatchingExecutionReport;
            case static_cast<char>(90): return Other;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(48): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum DKReason [E103]");
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *mantissaMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *mantissaMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -213,7 +213,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t mantissaSinceVersion() SBE_NOEXCEPT
    {
-        return 0;
+        return 6;
    }

    SBE_NODISCARD bool mantissaInActingVersion() SBE_NOEXCEPT
@@ -255,6 +255,11 @@ public:

    SBE_NODISCARD std::int64_t mantissa() const SBE_NOEXCEPT
    {
+        if (m_actingVersion < 6)
+        {
+            return INT64_C(9223372036854775807);
+        }
+
        std::int64_t val;
        std::memcpy(&val, m_buffer + m_offset + 0, sizeof(std::int64_t));
        return SBE_LITTLE_ENDIAN_ENCODE_64(val);
@@ -283,7 +288,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t exponentSinceVersion() SBE_NOEXCEPT
    {
-        return 0;
+        return 6;
    }

    SBE_NODISCARD bool exponentInActingVersion() SBE_NOEXCEPT
@@ -325,6 +330,11 @@ public:

    SBE_NODISCARD std::int8_t exponent() const SBE_NOEXCEPT
    {
+        if (m_actingVersion < 6)
+        {
+            return static_cast<std::int8_t>(127);
+        }
+
        std::int8_t val;
        std::memcpy(&val, m_buffer + m_offset + 8, sizeof(std::int8_t));
        return (val);
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(132);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(503);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = Establish503(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    Establish503 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2391,8 +2398,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, Establish503 _writer)
 {
-    Establish503 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    Establish503 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "Establish503", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(38);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(504);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = EstablishmentAck504(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    EstablishmentAck504 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -965,8 +972,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, EstablishmentAck504 _writer)
 {
-    EstablishmentAck504 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    EstablishmentAck504 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "EstablishmentAck504", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(72);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(505);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = EstablishmentReject505(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    EstablishmentReject505 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -958,8 +965,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, EstablishmentReject505 _writer)
 {
-    EstablishmentReject505 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    EstablishmentReject505 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "EstablishmentReject505", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_EXECACKSTATUS_H_
 #define _ILINKBINARY_EXECACKSTATUS_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ExecAckStatus
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    ExecInst &clear()
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_EXECMODE_H_
 #define _ILINKBINARY_EXECMODE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ExecMode
@@ -96,7 +32,7 @@ public:
    {
        Aggressive = static_cast<char>(65),
        Passive = static_cast<char>(80),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(0x00)
    };

    static ExecMode::Value get(const char value)
@@ -105,7 +41,7 @@ public:
        {
            case static_cast<char>(65): return Aggressive;
            case static_cast<char>(80): return Passive;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(0x00): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum ExecMode [E103]");
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_EXECREASON_H_
 #define _ILINKBINARY_EXECREASON_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ExecReason
@@ -103,6 +39,9 @@ public:
        CancelFromRiskManagementAPI = static_cast<std::uint8_t>(106),
        SelfMatchPreventionNewestOrderCancelled = static_cast<std::uint8_t>(107),
        Cancelduetovolquotedoptionorderrestedqtylessthanminordersize = static_cast<std::uint8_t>(108),
+        CancelRFCOrder = static_cast<std::uint8_t>(109),
+        CancelUponContractExpiration = static_cast<std::uint8_t>(110),
+        SystemCancel = static_cast<std::uint8_t>(111),
        NULL_VALUE = static_cast<std::uint8_t>(255)
    };

@@ -119,6 +58,9 @@ public:
            case static_cast<std::uint8_t>(106): return CancelFromRiskManagementAPI;
            case static_cast<std::uint8_t>(107): return SelfMatchPreventionNewestOrderCancelled;
            case static_cast<std::uint8_t>(108): return Cancelduetovolquotedoptionorderrestedqtylessthanminordersize;
+            case static_cast<std::uint8_t>(109): return CancelRFCOrder;
+            case static_cast<std::uint8_t>(110): return CancelUponContractExpiration;
+            case static_cast<std::uint8_t>(111): return SystemCancel;
            case static_cast<std::uint8_t>(255): return NULL_VALUE;
        }

@@ -138,6 +80,9 @@ public:
            case CancelFromRiskManagementAPI: return "CancelFromRiskManagementAPI";
            case SelfMatchPreventionNewestOrderCancelled: return "SelfMatchPreventionNewestOrderCancelled";
            case Cancelduetovolquotedoptionorderrestedqtylessthanminordersize: return "Cancelduetovolquotedoptionorderrestedqtylessthanminordersize";
+            case CancelRFCOrder: return "CancelRFCOrder";
+            case CancelUponContractExpiration: return "CancelUponContractExpiration";
+            case SystemCancel: return "SystemCancel";
            case NULL_VALUE: return "NULL_VALUE";
        }

@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_EXECTYPTRDCXL_H_
 #define _ILINKBINARY_EXECTYPTRDCXL_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ExecTypTrdCxl
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(101);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(539);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionAck539(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionAck539 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1352,6 +1359,11 @@ public:

    std::string getSenderIDAsJsonEscapedString()
    {
+        if (m_actingVersion < 4)
+        {
+            return std::string("");
+        }
+
        std::ostringstream oss;
        std::string s = getSenderIDAsString();

@@ -1654,6 +1666,11 @@ public:

    std::string getLocationAsJsonEscapedString()
    {
+        if (m_actingVersion < 5)
+        {
+            return std::string("");
+        }
+
        std::ostringstream oss;
        std::string s = getLocationAsString();

@@ -1811,8 +1828,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionAck539 _writer)
 {
-    ExecutionAck539 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionAck539 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionAck539", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(222);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(247);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(534);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(222);
+        return static_cast<std::uint16_t>(247);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportCancel534(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportCancel534 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3581,12 +3588,602 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 222;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 222, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 230;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 230, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportCancel534 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 230, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 231;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 231;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 231;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 231 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportCancel534 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 231 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 231, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportCancel534 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 231, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 231;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 231;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportCancel534 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 231, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 231 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportCancel534 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 231, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 231 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *CancelTextMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t cancelTextId() SBE_NOEXCEPT
+    {
+        return 2807;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t cancelTextSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool cancelTextInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= cancelTextSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t cancelTextEncodingOffset() SBE_NOEXCEPT
+    {
+        return 239;
+    }
+
+    static SBE_CONSTEXPR char cancelTextNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t cancelTextEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t cancelTextLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *cancelText() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 239;
+    }
+
+    SBE_NODISCARD char *cancelText() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 239;
+    }
+
+    SBE_NODISCARD char cancelText(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 239 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportCancel534 &cancelText(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 239 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getCancelText(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getCancelText [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 239, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportCancel534 &putCancelText(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 239, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getCancelTextAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 239;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getCancelTextAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getCancelTextAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getCancelTextAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 239;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportCancel534 &putCancelText(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 239, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 239 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportCancel534 &putCancelText(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 239, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 239 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportCancel534 _writer)
 {
-    ExecutionReportCancel534 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportCancel534 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportCancel534", )";
    builder << R"("sbeTemplateId": )";
@@ -3742,7 +4339,39 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();
+
+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("CancelText": )";
+    builder << '"' <<
+        writer.getCancelTextAsJsonEscapedString().c_str() << '"';

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(210);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(219);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(524);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(210);
+        return static_cast<std::uint16_t>(219);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportElimination524(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportElimination524 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3308,12 +3315,140 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 210;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 210, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 218;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 218, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportElimination524 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 218, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportElimination524 _writer)
 {
-    ExecutionReportElimination524 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportElimination524 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportElimination524", )";
    builder << R"("sbeTemplateId": )";
@@ -3453,7 +3588,29 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(225);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(226);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(531);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(225);
+        return static_cast<std::uint16_t>(226);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportModify531(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportModify531 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3589,12 +3596,93 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 225;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 225, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportModify531 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 225, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportModify531 _writer)
 {
-    ExecutionReportModify531 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportModify531 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportModify531", )";
    builder << R"("sbeTemplateId": )";
@@ -3750,7 +3838,18 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(217);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(226);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(522);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(217);
+        return static_cast<std::uint16_t>(226);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportNew522(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportNew522 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3447,12 +3454,140 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 217;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 217, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 225;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 225, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportNew522 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 225, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportNew522 _writer)
 {
-    ExecutionReportNew522 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportNew522 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportNew522", )";
    builder << R"("sbeTemplateId": )";
@@ -3600,7 +3735,29 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(194);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(219);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(564);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(194);
+        return static_cast<std::uint16_t>(219);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportPendingCancel564(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportPendingCancel564 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3022,12 +3029,602 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 194;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 194, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 202;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 202, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportPendingCancel564 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 202, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 203;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 203;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 203;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 203 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportPendingCancel564 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 203 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 203, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportPendingCancel564 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 203, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 203;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 203;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportPendingCancel564 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 203, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 203 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportPendingCancel564 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 203, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 203 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *CancelTextMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t cancelTextId() SBE_NOEXCEPT
+    {
+        return 2807;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t cancelTextSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool cancelTextInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= cancelTextSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t cancelTextEncodingOffset() SBE_NOEXCEPT
+    {
+        return 211;
+    }
+
+    static SBE_CONSTEXPR char cancelTextNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t cancelTextEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t cancelTextLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *cancelText() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 211;
+    }
+
+    SBE_NODISCARD char *cancelText() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 211;
+    }
+
+    SBE_NODISCARD char cancelText(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 211 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportPendingCancel564 &cancelText(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 211 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getCancelText(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getCancelText [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 211, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportPendingCancel564 &putCancelText(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 211, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getCancelTextAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 211;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getCancelTextAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getCancelTextAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getCancelTextAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 211;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportPendingCancel564 &putCancelText(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 211, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 211 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportPendingCancel564 &putCancelText(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 211, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 211 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportPendingCancel564 _writer)
 {
-    ExecutionReportPendingCancel564 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportPendingCancel564 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportPendingCancel564", )";
    builder << R"("sbeTemplateId": )";
@@ -3149,6 +3746,31 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("DiscretionPrice": )";
    builder << writer.discretionPrice();

+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();
+
+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("CancelText": )";
+    builder << '"' <<
+        writer.getCancelTextAsJsonEscapedString().c_str() << '"';
+
    builder << '}';

    return builder;
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(195);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(196);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(565);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(195);
+        return static_cast<std::uint16_t>(196);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportPendingReplace565(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportPendingReplace565 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3085,12 +3092,93 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 195;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 195, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportPendingReplace565 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 195, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportPendingReplace565 _writer)
 {
-    ExecutionReportPendingReplace565 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportPendingReplace565 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportPendingReplace565", )";
    builder << R"("sbeTemplateId": )";
@@ -3216,6 +3304,10 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("DiscretionPrice": )";
    builder << writer.discretionPrice();

+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();
+
    builder << '}';

    return builder;
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(475);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(483);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(523);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(475);
+        return static_cast<std::uint16_t>(483);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportReject523(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportReject523 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3724,12 +3731,64 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 475;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 475, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportReject523 _writer)
 {
-    ExecutionReportReject523 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportReject523 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportReject523", )";
    builder << R"("sbeTemplateId": )";
@@ -3886,7 +3945,25 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(488);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(513);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(532);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(488);
+        return static_cast<std::uint16_t>(513);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportStatus532(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportStatus532 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3728,12 +3735,602 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 488;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 488, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 496;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 496, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportStatus532 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 496, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 497;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 497;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 497;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 497 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportStatus532 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 497 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 497, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportStatus532 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 497, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 497;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 497;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportStatus532 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 497, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 497 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportStatus532 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 497, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 497 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *CancelTextMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t cancelTextId() SBE_NOEXCEPT
+    {
+        return 2807;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t cancelTextSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool cancelTextInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= cancelTextSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t cancelTextEncodingOffset() SBE_NOEXCEPT
+    {
+        return 505;
+    }
+
+    static SBE_CONSTEXPR char cancelTextNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t cancelTextEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t cancelTextLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *cancelText() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 505;
+    }
+
+    SBE_NODISCARD char *cancelText() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 505;
+    }
+
+    SBE_NODISCARD char cancelText(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 505 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    ExecutionReportStatus532 &cancelText(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 505 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getCancelText(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getCancelText [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 505, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    ExecutionReportStatus532 &putCancelText(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 505, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getCancelTextAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 505;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getCancelTextAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getCancelTextAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getCancelTextAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 505;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    ExecutionReportStatus532 &putCancelText(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 505, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 505 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    ExecutionReportStatus532 &putCancelText(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 505, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 505 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportStatus532 _writer)
 {
-    ExecutionReportStatus532 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportStatus532 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportStatus532", )";
    builder << R"("sbeTemplateId": )";
@@ -3898,7 +4495,39 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();
+
+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("CancelText": )";
+    builder << '"' <<
+        writer.getCancelTextAsJsonEscapedString().c_str() << '"';

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(222);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(548);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeAddendumOutright548(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeAddendumOutright548 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3366,7 +3373,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3374,17 +3381,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3394,7 +3390,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4017,7 +4012,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -4025,17 +4020,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -4045,7 +4029,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4781,11 +4764,25 @@ public:

            builder << ", ";
            builder << R"("ContraGrossTradeAmt": )";
+            if (writer.contraGrossTradeAmtInActingVersion())
+            {
                builder << writer.contraGrossTradeAmt();
+            }
+            else
+            {
+                builder << "{}";
+            }

            builder << ", ";
            builder << R"("ContraCalculatedCcyLastQty": )";
+            if (writer.contraCalculatedCcyLastQtyInActingVersion())
+            {
                builder << writer.contraCalculatedCcyLastQty();
+            }
+            else
+            {
+                builder << "{}";
+            }

            builder << '}';

@@ -4858,8 +4855,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeAddendumOutright548 _writer)
 {
-    ExecutionReportTradeAddendumOutright548 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeAddendumOutright548 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeAddendumOutright548", )";
    builder << R"("sbeTemplateId": )";
@@ -4983,7 +4985,14 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("TrdType": )";
@@ -5003,21 +5012,43 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("CalculatedCcyLastQty": )";
+    if (writer.calculatedCcyLastQtyInActingVersion())
+    {
        builder << writer.calculatedCcyLastQty();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("GrossTradeAmt": )";
+    if (writer.grossTradeAmtInActingVersion())
+    {
        builder << writer.grossTradeAmt();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("BenchmarkPrice": )";
+    if (writer.benchmarkPriceInActingVersion())
+    {
        builder << writer.benchmarkPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -5033,7 +5064,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -5052,14 +5084,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noFillsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(187);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(549);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeAddendumSpread549(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeAddendumSpread549 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3082,7 +3089,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3090,17 +3097,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3110,7 +3106,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3733,7 +3728,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3741,17 +3736,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3761,7 +3745,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *LegExecIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4528,7 +4511,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -4536,17 +4519,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -4556,7 +4528,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -5267,8 +5238,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeAddendumSpread549 _writer)
 {
-    ExecutionReportTradeAddendumSpread549 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeAddendumSpread549 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeAddendumSpread549", )";
    builder << R"("sbeTemplateId": )";
@@ -5406,7 +5382,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -5422,7 +5399,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoLegs": [)";
-        writer.noLegs().forEach([&](NoLegs& noLegs)
+        writer.noLegs().forEach(
+            [&](NoLegs &noLegs)
            {
                if (atLeastOne)
                {
@@ -5438,7 +5416,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -5457,18 +5436,21 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noLegs().forEach([](NoLegs e)
+        noFillsGroup.next().skip();
+    }
+    auto &noLegsGroup { noLegs() };
+    while (noLegsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noLegsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(196);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(550);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeAddendumSpreadLeg550(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeAddendumSpreadLeg550 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2753,7 +2760,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2761,17 +2768,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2781,7 +2777,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3404,7 +3399,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3412,17 +3407,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3432,7 +3416,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4143,8 +4126,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeAddendumSpreadLeg550 _writer)
 {
-    ExecutionReportTradeAddendumSpreadLeg550 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeAddendumSpreadLeg550 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeAddendumSpreadLeg550", )";
    builder << R"("sbeTemplateId": )";
@@ -4252,17 +4240,32 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("CalculatedCcyLastQty": )";
+    if (writer.calculatedCcyLastQtyInActingVersion())
+    {
        builder << writer.calculatedCcyLastQty();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("GrossTradeAmt": )";
+    if (writer.grossTradeAmtInActingVersion())
+    {
        builder << writer.grossTradeAmt();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -4278,7 +4281,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -4297,14 +4301,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noFillsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(276);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(293);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(525);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(276);
+        return static_cast<std::uint16_t>(293);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeOutright525(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeOutright525 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -4224,6 +4231,176 @@ public:
        return m_benchmarkPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 276;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 276, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
+    SBE_NODISCARD static const char *PriorityIndicatorMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t priorityIndicatorId() SBE_NOEXCEPT
+    {
+        return 638;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t priorityIndicatorSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool priorityIndicatorInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= priorityIndicatorSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingOffset() SBE_NOEXCEPT
+    {
+        return 284;
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(255);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(0);
+    }
+
+    static SBE_CONSTEXPR std::uint8_t priorityIndicatorMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<std::uint8_t>(254);
+    }
+
+    static SBE_CONSTEXPR std::size_t priorityIndicatorEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t priorityIndicator() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 284, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    ExecutionReportTradeOutright525 &priorityIndicator(const std::uint8_t value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 284, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
+    SBE_NODISCARD static const char *DisplayLimitPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t displayLimitPriceId() SBE_NOEXCEPT
+    {
+        return 9264;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t displayLimitPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool displayLimitPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= displayLimitPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t displayLimitPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 285;
+    }
+
+private:
+    PRICENULL9 m_displayLimitPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &displayLimitPrice()
+    {
+        m_displayLimitPrice.wrap(m_buffer, m_offset + 285, m_actingVersion, m_bufferLength);
+        return m_displayLimitPrice;
+    }
+
    class NoFills
    {
    private:
@@ -4350,7 +4527,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -4358,17 +4535,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -4378,7 +4544,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -5001,7 +5166,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -5009,17 +5174,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -5029,7 +5183,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -5685,11 +5838,25 @@ public:

            builder << ", ";
            builder << R"("ContraGrossTradeAmt": )";
+            if (writer.contraGrossTradeAmtInActingVersion())
+            {
                builder << writer.contraGrossTradeAmt();
+            }
+            else
+            {
+                builder << "{}";
+            }

            builder << ", ";
            builder << R"("ContraCalculatedCcyLastQty": )";
+            if (writer.contraCalculatedCcyLastQtyInActingVersion())
+            {
                builder << writer.contraCalculatedCcyLastQty();
+            }
+            else
+            {
+                builder << "{}";
+            }

            builder << '}';

@@ -5762,8 +5929,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeOutright525 _writer)
 {
-    ExecutionReportTradeOutright525 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeOutright525 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeOutright525", )";
    builder << R"("sbeTemplateId": )";
@@ -5939,7 +6111,14 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("TrdType": )";
@@ -5959,21 +6138,69 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("CalculatedCcyLastQty": )";
+    if (writer.calculatedCcyLastQtyInActingVersion())
+    {
        builder << writer.calculatedCcyLastQty();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("GrossTradeAmt": )";
+    if (writer.grossTradeAmtInActingVersion())
+    {
        builder << writer.grossTradeAmt();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("BenchmarkPrice": )";
+    if (writer.benchmarkPriceInActingVersion())
+    {
        builder << writer.benchmarkPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("PriorityIndicator": )";
+    builder << +writer.priorityIndicator();
+
+    builder << ", ";
+    builder << R"("DisplayLimitPrice": )";
+    if (writer.displayLimitPriceInActingVersion())
+    {
+        builder << writer.displayLimitPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -5989,7 +6216,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -6008,14 +6236,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noFillsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(230);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(526);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeSpread526(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeSpread526 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -3727,7 +3734,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3735,17 +3742,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3755,7 +3751,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4378,7 +4373,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -4386,17 +4381,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -4406,7 +4390,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *LegExecIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -5023,7 +5006,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -5031,17 +5014,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -5051,7 +5023,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -5682,8 +5653,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeSpread526 _writer)
 {
-    ExecutionReportTradeSpread526 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeSpread526 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeSpread526", )";
    builder << R"("sbeTemplateId": )";
@@ -5853,7 +5829,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -5869,7 +5846,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoLegs": [)";
-        writer.noLegs().forEach([&](NoLegs& noLegs)
+        writer.noLegs().forEach(
+            [&](NoLegs &noLegs)
            {
                if (atLeastOne)
                {
@@ -5885,7 +5863,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -5904,18 +5883,21 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noLegs().forEach([](NoLegs e)
+        noFillsGroup.next().skip();
+    }
+    auto &noLegsGroup { noLegs() };
+    while (noLegsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noLegsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(219);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(527);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = ExecutionReportTradeSpreadLeg527(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    ExecutionReportTradeSpreadLeg527 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2969,7 +2976,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2977,17 +2984,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2997,7 +2993,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *FillPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3620,7 +3615,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -3628,17 +3623,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -3648,7 +3632,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrderEventPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -4279,8 +4262,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, ExecutionReportTradeSpreadLeg527 _writer)
 {
-    ExecutionReportTradeSpreadLeg527 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    ExecutionReportTradeSpreadLeg527 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "ExecutionReportTradeSpreadLeg527", )";
    builder << R"("sbeTemplateId": )";
@@ -4400,17 +4388,32 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("CalculatedCcyLastQty": )";
+    if (writer.calculatedCcyLastQtyInActingVersion())
+    {
        builder << writer.calculatedCcyLastQty();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    builder << R"("GrossTradeAmt": )";
+    if (writer.grossTradeAmtInActingVersion())
+    {
        builder << writer.grossTradeAmt();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoFills": [)";
-        writer.noFills().forEach([&](NoFills& noFills)
+        writer.noFills().forEach(
+            [&](NoFills &noFills)
            {
                if (atLeastOne)
                {
@@ -4426,7 +4429,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoOrderEvents": [)";
-        writer.noOrderEvents().forEach([&](NoOrderEvents& noOrderEvents)
+        writer.noOrderEvents().forEach(
+            [&](NoOrderEvents &noOrderEvents)
            {
                if (atLeastOne)
                {
@@ -4445,14 +4449,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noFills().forEach([](NoFills e)
+    auto &noFillsGroup { noFills() };
+    while (noFillsGroup.hasNext())
    {
-        e.skip();
-    });
-    noOrderEvents().forEach([](NoOrderEvents e)
+        noFillsGroup.next().skip();
+    }
+    auto &noOrderEventsGroup { noOrderEvents() };
+    while (noOrderEventsGroup.hasNext())
    {
-        e.skip();
-    });
+        noOrderEventsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_EXPCYCLE_H_
 #define _ILINKBINARY_EXPCYCLE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ExpCycle
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_FTI_H_
 #define _ILINKBINARY_FTI_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class FTI
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *blockLengthMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_KEEPALIVELAPSED_H_
 #define _ILINKBINARY_KEEPALIVELAPSED_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class KeepAliveLapsed
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_LISTUPDACT_H_
 #define _ILINKBINARY_LISTUPDACT_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ListUpdAct
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MANUALORDIND_H_
 #define _ILINKBINARY_MANUALORDIND_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ManualOrdInd
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MANUALORDINDREQ_H_
 #define _ILINKBINARY_MANUALORDINDREQ_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ManualOrdIndReq
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSACTIONORDTYP_H_
 #define _ILINKBINARY_MASSACTIONORDTYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassActionOrdTyp
@@ -96,7 +32,7 @@ public:
    {
        Limit = static_cast<char>(50),
        StopLimit = static_cast<char>(52),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(48)
    };

    static MassActionOrdTyp::Value get(const char value)
@@ -105,7 +41,7 @@ public:
        {
            case static_cast<char>(50): return Limit;
            case static_cast<char>(52): return StopLimit;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(48): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum MassActionOrdTyp [E103]");
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSACTIONRESPONSE_H_
 #define _ILINKBINARY_MASSACTIONRESPONSE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassActionResponse
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSACTIONSCOPE_H_
 #define _ILINKBINARY_MASSACTIONSCOPE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassActionScope
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSCANCELTIF_H_
 #define _ILINKBINARY_MASSCANCELTIF_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassCancelTIF
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSCXLREQTYP_H_
 #define _ILINKBINARY_MASSCXLREQTYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassCxlReqTyp
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(92);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(123);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(517);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(92);
+        return static_cast<std::uint16_t>(123);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = MassQuote517(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    MassQuote517 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1574,6 +1581,11 @@ public:

    std::string getReservedAsJsonEscapedString()
    {
+        if (m_actingVersion < 5)
+        {
+            return std::string("");
+        }
+
        std::ostringstream oss;
        std::string s = getReservedAsString();

@@ -1654,6 +1666,310 @@ public:
    }
    #endif

+    SBE_NODISCARD static const char *Reserved1MetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reserved1Id() SBE_NOEXCEPT
+    {
+        return 5239;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reserved1SinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reserved1InActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reserved1SinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reserved1EncodingOffset() SBE_NOEXCEPT
+    {
+        return 92;
+    }
+
+    static SBE_CONSTEXPR char reserved1NullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char reserved1MinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char reserved1MaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t reserved1EncodingLength() SBE_NOEXCEPT
+    {
+        return 30;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t reserved1Length() SBE_NOEXCEPT
+    {
+        return 30;
+    }
+
+    SBE_NODISCARD const char *reserved1() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 92;
+    }
+
+    SBE_NODISCARD char *reserved1() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 92;
+    }
+
+    SBE_NODISCARD char reserved1(const std::uint64_t index) const
+    {
+        if (index >= 30)
+        {
+            throw std::runtime_error("index out of range for reserved1 [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 92 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    MassQuote517 &reserved1(const std::uint64_t index, const char value)
+    {
+        if (index >= 30)
+        {
+            throw std::runtime_error("index out of range for reserved1 [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 92 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getReserved1(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 30)
+        {
+            throw std::runtime_error("length too large for getReserved1 [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 92, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    MassQuote517 &putReserved1(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 92, src, sizeof(char) * 30);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getReserved1AsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 92;
+        std::size_t length = 0;
+
+        for (; length < 30 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getReserved1AsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getReserved1AsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getReserved1AsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 92;
+        std::size_t length = 0;
+
+        for (; length < 30 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    MassQuote517 &putReserved1(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 30)
+        {
+            throw std::runtime_error("string too large for putReserved1 [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 92, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 30; ++start)
+        {
+            m_buffer[m_offset + 92 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    MassQuote517 &putReserved1(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 30)
+        {
+            throw std::runtime_error("string too large for putReserved1 [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 92, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 30; ++start)
+        {
+            m_buffer[m_offset + 92 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *QuoteEntryOpenMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t quoteEntryOpenId() SBE_NOEXCEPT
+    {
+        return 9182;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t quoteEntryOpenSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool quoteEntryOpenInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= quoteEntryOpenSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingOffset() SBE_NOEXCEPT
+    {
+        return 122;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t quoteEntryOpenRaw() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 122, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    SBE_NODISCARD BooleanNULL::Value quoteEntryOpen() const
+    {
+        if (m_actingVersion < 8)
+        {
+            return BooleanNULL::NULL_VALUE;
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 122, sizeof(std::uint8_t));
+        return BooleanNULL::get((val));
+    }
+
+    MassQuote517 &quoteEntryOpen(const BooleanNULL::Value value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 122, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
    class NoQuoteEntries
    {
    private:
@@ -1780,7 +2096,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1788,17 +2104,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1808,7 +2113,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *BidPxMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2437,8 +2741,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, MassQuote517 _writer)
 {
-    MassQuote517 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    MassQuote517 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "MassQuote517", )";
    builder << R"("sbeTemplateId": )";
@@ -2499,11 +2808,21 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << '"' <<
        writer.getReservedAsJsonEscapedString().c_str() << '"';

+    builder << ", ";
+    builder << R"("Reserved1": )";
+    builder << '"' <<
+        writer.getReserved1AsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("QuoteEntryOpen": )";
+    builder << '"' << writer.quoteEntryOpen() << '"';
+
    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteEntries": [)";
-        writer.noQuoteEntries().forEach([&](NoQuoteEntries& noQuoteEntries)
+        writer.noQuoteEntries().forEach(
+            [&](NoQuoteEntries &noQuoteEntries)
            {
                if (atLeastOne)
                {
@@ -2522,10 +2841,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noQuoteEntries().forEach([](NoQuoteEntries e)
+    auto &noQuoteEntriesGroup { noQuoteEntries() };
+    while (noQuoteEntriesGroup.hasNext())
    {
-        e.skip();
-    });
+        noQuoteEntriesGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(350);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(351);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(545);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(350);
+        return static_cast<std::uint16_t>(351);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = MassQuoteAck545(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    MassQuoteAck545 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2264,6 +2271,79 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *QuoteEntryOpenMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t quoteEntryOpenId() SBE_NOEXCEPT
+    {
+        return 9182;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t quoteEntryOpenSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool quoteEntryOpenInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= quoteEntryOpenSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingOffset() SBE_NOEXCEPT
+    {
+        return 350;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t quoteEntryOpenRaw() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 350, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    SBE_NODISCARD BooleanNULL::Value quoteEntryOpen() const
+    {
+        if (m_actingVersion < 8)
+        {
+            return BooleanNULL::NULL_VALUE;
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 350, sizeof(std::uint8_t));
+        return BooleanNULL::get((val));
+    }
+
+    MassQuoteAck545 &quoteEntryOpen(const BooleanNULL::Value value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 350, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
    class NoQuoteEntries
    {
    private:
@@ -2390,7 +2470,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2398,17 +2478,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2418,7 +2487,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *QuoteEntryIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2795,8 +2863,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, MassQuoteAck545 _writer)
 {
-    MassQuoteAck545 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    MassQuoteAck545 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "MassQuoteAck545", )";
    builder << R"("sbeTemplateId": )";
@@ -2893,11 +2966,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("DelayToTime": )";
    builder << +writer.delayToTime();

+    builder << ", ";
+    builder << R"("QuoteEntryOpen": )";
+    builder << '"' << writer.quoteEntryOpen() << '"';
+
    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteEntries": [)";
-        writer.noQuoteEntries().forEach([&](NoQuoteEntries& noQuoteEntries)
+        writer.noQuoteEntries().forEach(
+            [&](NoQuoteEntries &noQuoteEntries)
            {
                if (atLeastOne)
                {
@@ -2916,10 +2994,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noQuoteEntries().forEach([](NoQuoteEntries e)
+    auto &noQuoteEntriesGroup { noQuoteEntries() };
+    while (noQuoteEntriesGroup.hasNext())
    {
-        e.skip();
-    });
+        noQuoteEntriesGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSSTATUSORDTYP_H_
 #define _ILINKBINARY_MASSSTATUSORDTYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassStatusOrdTyp
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSSTATUSREQTYP_H_
 #define _ILINKBINARY_MASSSTATUSREQTYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassStatusReqTyp
@@ -96,6 +32,7 @@ public:
    {
        Instrument = static_cast<std::uint8_t>(1),
        InstrumentGroup = static_cast<std::uint8_t>(3),
+        AllOrders = static_cast<std::uint8_t>(7),
        MarketSegment = static_cast<std::uint8_t>(100),
        NULL_VALUE = static_cast<std::uint8_t>(255)
    };
@@ -106,6 +43,7 @@ public:
        {
            case static_cast<std::uint8_t>(1): return Instrument;
            case static_cast<std::uint8_t>(3): return InstrumentGroup;
+            case static_cast<std::uint8_t>(7): return AllOrders;
            case static_cast<std::uint8_t>(100): return MarketSegment;
            case static_cast<std::uint8_t>(255): return NULL_VALUE;
        }
@@ -119,6 +57,7 @@ public:
        {
            case Instrument: return "Instrument";
            case InstrumentGroup: return "InstrumentGroup";
+            case AllOrders: return "AllOrders";
            case MarketSegment: return "MarketSegment";
            case NULL_VALUE: return "NULL_VALUE";
        }
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_MASSSTATUSTIF_H_
 #define _ILINKBINARY_MASSSTATUSTIF_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class MassStatusTIF
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *yearMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *blockLengthMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(76);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(500);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = Negotiate500(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    Negotiate500 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1756,8 +1763,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, Negotiate500 _writer)
 {
-    Negotiate500 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    Negotiate500 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "Negotiate500", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(68);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(502);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = NegotiationReject502(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    NegotiationReject502 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -887,8 +894,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, NegotiationReject502 _writer)
 {
-    NegotiationReject502 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    NegotiationReject502 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "NegotiationReject502", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(32);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(501);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = NegotiationResponse501(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    NegotiationResponse501 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1131,8 +1138,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, NegotiationResponse501 _writer)
 {
-    NegotiationResponse501 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    NegotiationResponse501 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "NegotiationResponse501", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(74);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(544);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = NewOrderCross544(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    NewOrderCross544 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1787,7 +1794,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1795,17 +1802,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1815,7 +1811,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *ClOrdIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2387,8 +2382,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, NewOrderCross544 _writer)
 {
-    NewOrderCross544 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    NewOrderCross544 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "NewOrderCross544", )";
    builder << R"("sbeTemplateId": )";
@@ -2440,7 +2440,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoSides": [)";
-        writer.noSides().forEach([&](NoSides& noSides)
+        writer.noSides().forEach(
+            [&](NoSides &noSides)
            {
                if (atLeastOne)
                {
@@ -2459,10 +2460,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noSides().forEach([](NoSides e)
+    auto &noSidesGroup { noSides() };
+    while (noSidesGroup.hasNext())
    {
-        e.skip();
-    });
+        noSidesGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(124);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(132);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(514);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(124);
+        return static_cast<std::uint16_t>(132);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = NewOrderSingle514(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    NewOrderSingle514 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2292,12 +2299,64 @@ public:
        return m_discretionPrice;
    }

+    SBE_NODISCARD static const char *ReservationPriceMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "Price";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t reservationPriceId() SBE_NOEXCEPT
+    {
+        return 9562;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t reservationPriceSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool reservationPriceInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= reservationPriceSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t reservationPriceEncodingOffset() SBE_NOEXCEPT
+    {
+        return 124;
+    }
+
+private:
+    PRICENULL9 m_reservationPrice;
+
+public:
+    SBE_NODISCARD PRICENULL9 &reservationPrice()
+    {
+        m_reservationPrice.wrap(m_buffer, m_offset + 124, m_actingVersion, m_bufferLength);
+        return m_reservationPrice;
+    }
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, NewOrderSingle514 _writer)
 {
-    NewOrderSingle514 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    NewOrderSingle514 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "NewOrderSingle514", )";
    builder << R"("sbeTemplateId": )";
@@ -2400,7 +2459,25 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }
+
+    builder << ", ";
+    builder << R"("ReservationPrice": )";
+    if (writer.reservationPriceInActingVersion())
+    {
+        builder << writer.reservationPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(17);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(513);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = NotApplied513(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    NotApplied513 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -618,8 +625,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, NotApplied513 _writer)
 {
-    NotApplied513 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    NotApplied513 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "NotApplied513", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_OFMOVERRIDEREQ_H_
 #define _ILINKBINARY_OFMOVERRIDEREQ_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OFMOverrideReq
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDSTATUSTRD_H_
 #define _ILINKBINARY_ORDSTATUSTRD_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrdStatusTrd
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDSTATUSTRDCXL_H_
 #define _ILINKBINARY_ORDSTATUSTRDCXL_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrdStatusTrdCxl
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(409);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(535);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderCancelReject535(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderCancelReject535 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2589,8 +2596,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderCancelReject535 _writer)
 {
-    OrderCancelReject535 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderCancelReject535 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderCancelReject535", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(409);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(536);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderCancelReplaceReject536(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderCancelReplaceReject536 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2589,8 +2596,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderCancelReplaceReject536 _writer)
 {
-    OrderCancelReplaceReject536 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderCancelReplaceReject536 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderCancelReplaceReject536", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(133);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(515);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderCancelReplaceRequest515(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderCancelReplaceRequest515 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2430,8 +2437,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderCancelReplaceRequest515 _writer)
 {
-    OrderCancelReplaceRequest515 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderCancelReplaceRequest515 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderCancelReplaceRequest515", )";
    builder << R"("sbeTemplateId": )";
@@ -2542,7 +2554,14 @@ friend std::basic_ostream<CharT, Traits>& operator << (

    builder << ", ";
    builder << R"("DiscretionPrice": )";
+    if (writer.discretionPriceInActingVersion())
+    {
        builder << writer.discretionPrice();
+    }
+    else
+    {
+        builder << "{}";
+    }

    builder << '}';

@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(88);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(96);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(516);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(88);
+        return static_cast<std::uint16_t>(96);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderCancelRequest516(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderCancelRequest516 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1571,12 +1578,248 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 88;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 88;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 88;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 88 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    OrderCancelRequest516 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 88 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 88, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    OrderCancelRequest516 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 88, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 88;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 88;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    OrderCancelRequest516 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 88, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 88 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    OrderCancelRequest516 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 88, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 88 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderCancelRequest516 _writer)
 {
-    OrderCancelRequest516 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderCancelRequest516 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderCancelRequest516", )";
    builder << R"("sbeTemplateId": )";
@@ -1633,6 +1876,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("LiquidityFlag": )";
    builder << '"' << writer.liquidityFlag() << '"';

+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
    builder << '}';

    return builder;
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDEREVENTTYPE_H_
 #define _ILINKBINARY_ORDEREVENTTYPE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrderEventType
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(114);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(130);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(562);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(114);
+        return static_cast<std::uint16_t>(130);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderMassActionReport562(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderMassActionReport562 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2697,6 +2704,468 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 114;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 114;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 114;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 114 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    OrderMassActionReport562 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 114 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 114, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    OrderMassActionReport562 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 114, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 114;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 114;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    OrderMassActionReport562 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 114, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 114 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    OrderMassActionReport562 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 114, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 114 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *CancelTextMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t cancelTextId() SBE_NOEXCEPT
+    {
+        return 2807;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t cancelTextSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool cancelTextInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= cancelTextSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t cancelTextEncodingOffset() SBE_NOEXCEPT
+    {
+        return 122;
+    }
+
+    static SBE_CONSTEXPR char cancelTextNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t cancelTextEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t cancelTextLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *cancelText() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 122;
+    }
+
+    SBE_NODISCARD char *cancelText() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 122;
+    }
+
+    SBE_NODISCARD char cancelText(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 122 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    OrderMassActionReport562 &cancelText(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 122 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getCancelText(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getCancelText [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 122, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    OrderMassActionReport562 &putCancelText(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 122, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getCancelTextAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 122;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getCancelTextAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getCancelTextAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getCancelTextAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 122;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    OrderMassActionReport562 &putCancelText(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 122, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 122 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    OrderMassActionReport562 &putCancelText(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 122, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 122 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
    class NoAffectedOrders
    {
    private:
@@ -2823,7 +3292,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2831,17 +3300,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2851,7 +3309,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *OrigCIOrdIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3289,8 +3746,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderMassActionReport562 _writer)
 {
-    OrderMassActionReport562 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderMassActionReport562 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderMassActionReport562", )";
    builder << R"("sbeTemplateId": )";
@@ -3407,11 +3869,22 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("DelayToTime": )";
    builder << +writer.delayToTime();

+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("CancelText": )";
+    builder << '"' <<
+        writer.getCancelTextAsJsonEscapedString().c_str() << '"';
+
    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoAffectedOrders": [)";
-        writer.noAffectedOrders().forEach([&](NoAffectedOrders& noAffectedOrders)
+        writer.noAffectedOrders().forEach(
+            [&](NoAffectedOrders &noAffectedOrders)
            {
                if (atLeastOne)
                {
@@ -3430,10 +3903,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noAffectedOrders().forEach([](NoAffectedOrders e)
+    auto &noAffectedOrdersGroup { noAffectedOrders() };
+    while (noAffectedOrdersGroup.hasNext())
    {
-        e.skip();
-    });
+        noAffectedOrdersGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(71);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(79);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(529);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(71);
+        return static_cast<std::uint16_t>(79);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderMassActionRequest529(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderMassActionRequest529 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1948,12 +1955,248 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 71;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 71;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 71;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 71 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    OrderMassActionRequest529 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 71 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 71, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    OrderMassActionRequest529 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 71, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 71;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 71;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    OrderMassActionRequest529 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 71, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 71 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    OrderMassActionRequest529 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 71, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 71 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
 template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderMassActionRequest529 _writer)
 {
-    OrderMassActionRequest529 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderMassActionRequest529 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderMassActionRequest529", )";
    builder << R"("sbeTemplateId": )";
@@ -2026,6 +2269,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("LiquidityFlag": )";
    builder << '"' << writer.liquidityFlag() << '"';

+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
    builder << '}';

    return builder;
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(68);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(530);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderMassStatusRequest530(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderMassStatusRequest530 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1638,8 +1645,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderMassStatusRequest530 _writer)
 {
-    OrderMassStatusRequest530 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderMassStatusRequest530 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderMassStatusRequest530", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDERSTATUS_H_
 #define _ILINKBINARY_ORDERSTATUS_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrderStatus
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(62);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(533);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = OrderStatusRequest533(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    OrderStatusRequest533 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1172,8 +1179,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, OrderStatusRequest533 _writer)
 {
-    OrderStatusRequest533 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    OrderStatusRequest533 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "OrderStatusRequest533", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDERTYPE_H_
 #define _ILINKBINARY_ORDERTYPE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrderType
@@ -98,7 +34,7 @@ public:
        Limit = static_cast<char>(50),
        StopLimit = static_cast<char>(52),
        MarketWithLeftoverAsLimit = static_cast<char>(75),
-        NULL_VALUE = static_cast<char>(0)
+        NULL_VALUE = static_cast<char>(48)
    };

    static OrderType::Value get(const char value)
@@ -109,7 +45,7 @@ public:
            case static_cast<char>(50): return Limit;
            case static_cast<char>(52): return StopLimit;
            case static_cast<char>(75): return MarketWithLeftoverAsLimit;
-            case static_cast<char>(0): return NULL_VALUE;
+            case static_cast<char>(48): return NULL_VALUE;
        }

        throw std::runtime_error("unknown value for enum OrderType [E103]");
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_ORDERTYPEREQ_H_
 #define _ILINKBINARY_ORDERTYPEREQ_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class OrderTypeReq
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *mantissaMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -194,7 +194,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static const char *mantissaMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_PARTYDETAILROLE_H_
 #define _ILINKBINARY_PARTYDETAILROLE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class PartyDetailRole
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(147);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(518);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = PartyDetailsDefinitionRequest518(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    PartyDetailsDefinitionRequest518 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1868,7 +1875,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1876,17 +1883,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1896,7 +1892,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *PartyDetailIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2498,7 +2493,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2506,17 +2501,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2526,7 +2510,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *TrdRegPublicationTypeMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2753,8 +2736,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, PartyDetailsDefinitionRequest518 _writer)
 {
-    PartyDetailsDefinitionRequest518 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    PartyDetailsDefinitionRequest518 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "PartyDetailsDefinitionRequest518", )";
    builder << R"("sbeTemplateId": )";
@@ -2830,7 +2818,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoPartyDetails": [)";
-        writer.noPartyDetails().forEach([&](NoPartyDetails& noPartyDetails)
+        writer.noPartyDetails().forEach(
+            [&](NoPartyDetails &noPartyDetails)
            {
                if (atLeastOne)
                {
@@ -2846,7 +2835,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoTrdRegPublications": [)";
-        writer.noTrdRegPublications().forEach([&](NoTrdRegPublications& noTrdRegPublications)
+        writer.noTrdRegPublications().forEach(
+            [&](NoTrdRegPublications &noTrdRegPublications)
            {
                if (atLeastOne)
                {
@@ -2865,14 +2855,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noPartyDetails().forEach([](NoPartyDetails e)
+    auto &noPartyDetailsGroup { noPartyDetails() };
+    while (noPartyDetailsGroup.hasNext())
    {
-        e.skip();
-    });
-    noTrdRegPublications().forEach([](NoTrdRegPublications e)
+        noPartyDetailsGroup.next().skip();
+    }
+    auto &noTrdRegPublicationsGroup { noTrdRegPublications() };
+    while (noTrdRegPublicationsGroup.hasNext())
    {
-        e.skip();
-    });
+        noTrdRegPublicationsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(159);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(519);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = PartyDetailsDefinitionRequestAck519(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    PartyDetailsDefinitionRequestAck519 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2207,7 +2214,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2215,17 +2222,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2235,7 +2231,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *PartyDetailIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2837,7 +2832,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2845,17 +2840,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2865,7 +2849,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *TrdRegPublicationTypeMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3092,8 +3075,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, PartyDetailsDefinitionRequestAck519 _writer)
 {
-    PartyDetailsDefinitionRequestAck519 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    PartyDetailsDefinitionRequestAck519 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "PartyDetailsDefinitionRequestAck519", )";
    builder << R"("sbeTemplateId": )";
@@ -3189,7 +3177,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoPartyDetails": [)";
-        writer.noPartyDetails().forEach([&](NoPartyDetails& noPartyDetails)
+        writer.noPartyDetails().forEach(
+            [&](NoPartyDetails &noPartyDetails)
            {
                if (atLeastOne)
                {
@@ -3205,7 +3194,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoTrdRegPublications": [)";
-        writer.noTrdRegPublications().forEach([&](NoTrdRegPublications& noTrdRegPublications)
+        writer.noTrdRegPublications().forEach(
+            [&](NoTrdRegPublications &noTrdRegPublications)
            {
                if (atLeastOne)
                {
@@ -3224,14 +3214,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noPartyDetails().forEach([](NoPartyDetails e)
+    auto &noPartyDetailsGroup { noPartyDetails() };
+    while (noPartyDetailsGroup.hasNext())
    {
-        e.skip();
-    });
-    noTrdRegPublications().forEach([](NoTrdRegPublications e)
+        noPartyDetailsGroup.next().skip();
+    }
+    auto &noTrdRegPublicationsGroup { noTrdRegPublications() };
+    while (noTrdRegPublicationsGroup.hasNext())
    {
-        e.skip();
-    });
+        noTrdRegPublicationsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(93);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(538);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = PartyDetailsListReport538(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    PartyDetailsListReport538 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2002,7 +2009,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2010,17 +2017,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2030,7 +2026,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *PartyDetailIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2632,7 +2627,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2640,17 +2635,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2660,7 +2644,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *TrdRegPublicationTypeMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2887,8 +2870,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, PartyDetailsListReport538 _writer)
 {
-    PartyDetailsListReport538 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    PartyDetailsListReport538 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "PartyDetailsListReport538", )";
    builder << R"("sbeTemplateId": )";
@@ -2983,7 +2971,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoPartyDetails": [)";
-        writer.noPartyDetails().forEach([&](NoPartyDetails& noPartyDetails)
+        writer.noPartyDetails().forEach(
+            [&](NoPartyDetails &noPartyDetails)
            {
                if (atLeastOne)
                {
@@ -2999,7 +2988,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoTrdRegPublications": [)";
-        writer.noTrdRegPublications().forEach([&](NoTrdRegPublications& noTrdRegPublications)
+        writer.noTrdRegPublications().forEach(
+            [&](NoTrdRegPublications &noTrdRegPublications)
            {
                if (atLeastOne)
                {
@@ -3018,14 +3008,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noPartyDetails().forEach([](NoPartyDetails e)
+    auto &noPartyDetailsGroup { noPartyDetails() };
+    while (noPartyDetailsGroup.hasNext())
    {
-        e.skip();
-    });
-    noTrdRegPublications().forEach([](NoTrdRegPublications e)
+        noPartyDetailsGroup.next().skip();
+    }
+    auto &noTrdRegPublicationsGroup { noTrdRegPublications() };
+    while (noTrdRegPublicationsGroup.hasNext())
    {
-        e.skip();
-    });
+        noTrdRegPublicationsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(20);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(537);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = PartyDetailsListRequest537(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    PartyDetailsListRequest537 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -677,7 +684,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -685,17 +692,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -705,7 +701,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *RequestingPartyIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -1279,7 +1274,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1287,17 +1282,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1307,7 +1291,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *PartyIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -1616,8 +1599,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, PartyDetailsListRequest537 _writer)
 {
-    PartyDetailsListRequest537 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    PartyDetailsListRequest537 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "PartyDetailsListRequest537", )";
    builder << R"("sbeTemplateId": )";
@@ -1639,7 +1627,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoRequestingPartyIDs": [)";
-        writer.noRequestingPartyIDs().forEach([&](NoRequestingPartyIDs& noRequestingPartyIDs)
+        writer.noRequestingPartyIDs().forEach(
+            [&](NoRequestingPartyIDs &noRequestingPartyIDs)
            {
                if (atLeastOne)
                {
@@ -1655,7 +1644,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoPartyIDs": [)";
-        writer.noPartyIDs().forEach([&](NoPartyIDs& noPartyIDs)
+        writer.noPartyIDs().forEach(
+            [&](NoPartyIDs &noPartyIDs)
            {
                if (atLeastOne)
                {
@@ -1674,14 +1664,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noRequestingPartyIDs().forEach([](NoRequestingPartyIDs e)
+    auto &noRequestingPartyIDsGroup { noRequestingPartyIDs() };
+    while (noRequestingPartyIDsGroup.hasNext())
    {
-        e.skip();
-    });
-    noPartyIDs().forEach([](NoPartyIDs e)
+        noRequestingPartyIDsGroup.next().skip();
+    }
+    auto &noPartyIDsGroup { noPartyIDs() };
+    while (noPartyIDsGroup.hasNext())
    {
-        e.skip();
-    });
+        noPartyIDsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_QUOTEACKSTATUS_H_
 #define _ILINKBINARY_QUOTEACKSTATUS_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class QuoteAckStatus
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(52);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(61);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(528);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(52);
+        return static_cast<std::uint16_t>(61);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = QuoteCancel528(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    QuoteCancel528 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1223,6 +1230,310 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 52;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 52;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 52;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 52 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    QuoteCancel528 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 52 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 52, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    QuoteCancel528 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 52, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 52;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 52;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    QuoteCancel528 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 52, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 52 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    QuoteCancel528 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 52, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 52 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *QuoteEntryOpenMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t quoteEntryOpenId() SBE_NOEXCEPT
+    {
+        return 9182;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t quoteEntryOpenSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool quoteEntryOpenInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= quoteEntryOpenSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingOffset() SBE_NOEXCEPT
+    {
+        return 60;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t quoteEntryOpenRaw() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 60, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    SBE_NODISCARD BooleanNULL::Value quoteEntryOpen() const
+    {
+        if (m_actingVersion < 8)
+        {
+            return BooleanNULL::NULL_VALUE;
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 60, sizeof(std::uint8_t));
+        return BooleanNULL::get((val));
+    }
+
+    QuoteCancel528 &quoteEntryOpen(const BooleanNULL::Value value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 60, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
    class NoQuoteEntries
    {
    private:
@@ -1349,7 +1660,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1357,17 +1668,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1377,7 +1677,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *SecurityGroupMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -1862,7 +2161,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1870,17 +2169,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1890,7 +2178,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *BidSizeMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2192,8 +2479,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, QuoteCancel528 _writer)
 {
-    QuoteCancel528 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    QuoteCancel528 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "QuoteCancel528", )";
    builder << R"("sbeTemplateId": )";
@@ -2237,11 +2529,21 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("LiquidityFlag": )";
    builder << '"' << writer.liquidityFlag() << '"';

+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("QuoteEntryOpen": )";
+    builder << '"' << writer.quoteEntryOpen() << '"';
+
    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteEntries": [)";
-        writer.noQuoteEntries().forEach([&](NoQuoteEntries& noQuoteEntries)
+        writer.noQuoteEntries().forEach(
+            [&](NoQuoteEntries &noQuoteEntries)
            {
                if (atLeastOne)
                {
@@ -2257,7 +2559,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteSets": [)";
-        writer.noQuoteSets().forEach([&](NoQuoteSets& noQuoteSets)
+        writer.noQuoteSets().forEach(
+            [&](NoQuoteSets &noQuoteSets)
            {
                if (atLeastOne)
                {
@@ -2276,14 +2579,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noQuoteEntries().forEach([](NoQuoteEntries e)
+    auto &noQuoteEntriesGroup { noQuoteEntries() };
+    while (noQuoteEntriesGroup.hasNext())
    {
-        e.skip();
-    });
-    noQuoteSets().forEach([](NoQuoteSets e)
+        noQuoteEntriesGroup.next().skip();
+    }
+    auto &noQuoteSetsGroup { noQuoteSets() };
+    while (noQuoteSetsGroup.hasNext())
    {
-        e.skip();
-    });
+        noQuoteSetsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -164,10 +165,10 @@ private:
    }

 public:
-    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(351);
+    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(368);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(563);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -220,7 +222,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeBlockLength() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(351);
+        return static_cast<std::uint16_t>(368);
    }

    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t sbeBlockAndHeaderLength() SBE_NOEXCEPT
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = QuoteCancelAck563(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    QuoteCancelAck563 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2392,6 +2399,541 @@ public:
        return *this;
    }

+    SBE_NODISCARD static const char *OrigOrderUserMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t origOrderUserId() SBE_NOEXCEPT
+    {
+        return 9937;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t origOrderUserSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool origOrderUserInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= origOrderUserSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t origOrderUserEncodingOffset() SBE_NOEXCEPT
+    {
+        return 351;
+    }
+
+    static SBE_CONSTEXPR char origOrderUserNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char origOrderUserMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t origOrderUserEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t origOrderUserLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *origOrderUser() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 351;
+    }
+
+    SBE_NODISCARD char *origOrderUser() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 351;
+    }
+
+    SBE_NODISCARD char origOrderUser(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 351 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    QuoteCancelAck563 &origOrderUser(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for origOrderUser [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 351 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getOrigOrderUser(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getOrigOrderUser [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 351, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    QuoteCancelAck563 &putOrigOrderUser(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 351, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getOrigOrderUserAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 351;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getOrigOrderUserAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getOrigOrderUserAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getOrigOrderUserAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 351;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    QuoteCancelAck563 &putOrigOrderUser(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 351, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 351 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    QuoteCancelAck563 &putOrigOrderUser(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putOrigOrderUser [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 351, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 351 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *CancelTextMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "String";
+            case MetaAttribute::PRESENCE: return "optional";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t cancelTextId() SBE_NOEXCEPT
+    {
+        return 2807;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t cancelTextSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool cancelTextInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= cancelTextSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t cancelTextEncodingOffset() SBE_NOEXCEPT
+    {
+        return 359;
+    }
+
+    static SBE_CONSTEXPR char cancelTextNullValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(0);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMinValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(32);
+    }
+
+    static SBE_CONSTEXPR char cancelTextMaxValue() SBE_NOEXCEPT
+    {
+        return static_cast<char>(126);
+    }
+
+    static SBE_CONSTEXPR std::size_t cancelTextEncodingLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    static SBE_CONSTEXPR std::uint64_t cancelTextLength() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD const char *cancelText() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 359;
+    }
+
+    SBE_NODISCARD char *cancelText() SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return nullptr;
+        }
+
+        return m_buffer + m_offset + 359;
+    }
+
+    SBE_NODISCARD char cancelText(const std::uint64_t index) const
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E104]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return static_cast<char>(0);
+        }
+
+        char val;
+        std::memcpy(&val, m_buffer + m_offset + 359 + (index * 1), sizeof(char));
+        return (val);
+    }
+
+    QuoteCancelAck563 &cancelText(const std::uint64_t index, const char value)
+    {
+        if (index >= 8)
+        {
+            throw std::runtime_error("index out of range for cancelText [E105]");
+        }
+
+        char val = (value);
+        std::memcpy(m_buffer + m_offset + 359 + (index * 1), &val, sizeof(char));
+        return *this;
+    }
+
+    std::uint64_t getCancelText(char *const dst, const std::uint64_t length) const
+    {
+        if (length > 8)
+        {
+            throw std::runtime_error("length too large for getCancelText [E106]");
+        }
+
+        if (m_actingVersion < 8)
+        {
+            return 0;
+        }
+
+        std::memcpy(dst, m_buffer + m_offset + 359, sizeof(char) * static_cast<std::size_t>(length));
+        return length;
+    }
+
+    QuoteCancelAck563 &putCancelText(const char *const src) SBE_NOEXCEPT
+    {
+        std::memcpy(m_buffer + m_offset + 359, src, sizeof(char) * 8);
+        return *this;
+    }
+
+    SBE_NODISCARD std::string getCancelTextAsString() const
+    {
+        const char *buffer = m_buffer + m_offset + 359;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string result(buffer, length);
+
+        return result;
+    }
+
+    std::string getCancelTextAsJsonEscapedString()
+    {
+        if (m_actingVersion < 8)
+        {
+            return std::string("");
+        }
+
+        std::ostringstream oss;
+        std::string s = getCancelTextAsString();
+
+        for (const auto c : s)
+        {
+            switch (c)
+            {
+                case '"': oss << "\\\""; break;
+                case '\\': oss << "\\\\"; break;
+                case '\b': oss << "\\b"; break;
+                case '\f': oss << "\\f"; break;
+                case '\n': oss << "\\n"; break;
+                case '\r': oss << "\\r"; break;
+                case '\t': oss << "\\t"; break;
+
+                default:
+                    if ('\x00' <= c && c <= '\x1f')
+                    {
+                        oss << "\\u" << std::hex << std::setw(4)
+                            << std::setfill('0') << (int)(c);
+                    }
+                    else
+                    {
+                        oss << c;
+                    }
+            }
+        }
+
+        return oss.str();
+    }
+
+    #if __cplusplus >= 201703L
+    SBE_NODISCARD std::string_view getCancelTextAsStringView() const SBE_NOEXCEPT
+    {
+        const char *buffer = m_buffer + m_offset + 359;
+        std::size_t length = 0;
+
+        for (; length < 8 && *(buffer + length) != '\0'; ++length);
+        std::string_view result(buffer, length);
+
+        return result;
+    }
+    #endif
+
+    #if __cplusplus >= 201703L
+    QuoteCancelAck563 &putCancelText(const std::string_view str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 359, str.data(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 359 + start] = 0;
+        }
+
+        return *this;
+    }
+    #else
+    QuoteCancelAck563 &putCancelText(const std::string &str)
+    {
+        const std::size_t srcLength = str.length();
+        if (srcLength > 8)
+        {
+            throw std::runtime_error("string too large for putCancelText [E106]");
+        }
+
+        std::memcpy(m_buffer + m_offset + 359, str.c_str(), srcLength);
+        for (std::size_t start = srcLength; start < 8; ++start)
+        {
+            m_buffer[m_offset + 359 + start] = 0;
+        }
+
+        return *this;
+    }
+    #endif
+
+    SBE_NODISCARD static const char *QuoteEntryOpenMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
+    {
+        switch (metaAttribute)
+        {
+            case MetaAttribute::SEMANTIC_TYPE: return "int";
+            case MetaAttribute::PRESENCE: return "required";
+            default: return "";
+        }
+    }
+
+    static SBE_CONSTEXPR std::uint16_t quoteEntryOpenId() SBE_NOEXCEPT
+    {
+        return 9182;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::uint64_t quoteEntryOpenSinceVersion() SBE_NOEXCEPT
+    {
+        return 8;
+    }
+
+    SBE_NODISCARD bool quoteEntryOpenInActingVersion() SBE_NOEXCEPT
+    {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+        return m_actingVersion >= quoteEntryOpenSinceVersion();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingOffset() SBE_NOEXCEPT
+    {
+        return 367;
+    }
+
+    SBE_NODISCARD static SBE_CONSTEXPR std::size_t quoteEntryOpenEncodingLength() SBE_NOEXCEPT
+    {
+        return 1;
+    }
+
+    SBE_NODISCARD std::uint8_t quoteEntryOpenRaw() const SBE_NOEXCEPT
+    {
+        if (m_actingVersion < 8)
+        {
+            return static_cast<std::uint8_t>(255);
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 367, sizeof(std::uint8_t));
+        return (val);
+    }
+
+    SBE_NODISCARD BooleanNULL::Value quoteEntryOpen() const
+    {
+        if (m_actingVersion < 8)
+        {
+            return BooleanNULL::NULL_VALUE;
+        }
+
+        std::uint8_t val;
+        std::memcpy(&val, m_buffer + m_offset + 367, sizeof(std::uint8_t));
+        return BooleanNULL::get((val));
+    }
+
+    QuoteCancelAck563 &quoteEntryOpen(const BooleanNULL::Value value) SBE_NOEXCEPT
+    {
+        std::uint8_t val = (value);
+        std::memcpy(m_buffer + m_offset + 367, &val, sizeof(std::uint8_t));
+        return *this;
+    }
+
    class NoQuoteEntries
    {
    private:
@@ -2518,7 +3060,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2526,17 +3068,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2546,7 +3077,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *QuoteEntryIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -2970,7 +3500,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -2978,17 +3508,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -2998,7 +3517,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *QuoteSetIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -3225,8 +3743,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, QuoteCancelAck563 _writer)
 {
-    QuoteCancelAck563 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    QuoteCancelAck563 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "QuoteCancelAck563", )";
    builder << R"("sbeTemplateId": )";
@@ -3331,11 +3854,26 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    builder << R"("DelayToTime": )";
    builder << +writer.delayToTime();

+    builder << ", ";
+    builder << R"("OrigOrderUser": )";
+    builder << '"' <<
+        writer.getOrigOrderUserAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("CancelText": )";
+    builder << '"' <<
+        writer.getCancelTextAsJsonEscapedString().c_str() << '"';
+
+    builder << ", ";
+    builder << R"("QuoteEntryOpen": )";
+    builder << '"' << writer.quoteEntryOpen() << '"';
+
    builder << ", ";
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteEntries": [)";
-        writer.noQuoteEntries().forEach([&](NoQuoteEntries& noQuoteEntries)
+        writer.noQuoteEntries().forEach(
+            [&](NoQuoteEntries &noQuoteEntries)
            {
                if (atLeastOne)
                {
@@ -3351,7 +3889,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoQuoteSets": [)";
-        writer.noQuoteSets().forEach([&](NoQuoteSets& noQuoteSets)
+        writer.noQuoteSets().forEach(
+            [&](NoQuoteSets &noQuoteSets)
            {
                if (atLeastOne)
                {
@@ -3370,14 +3909,16 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noQuoteEntries().forEach([](NoQuoteEntries e)
+    auto &noQuoteEntriesGroup { noQuoteEntries() };
+    while (noQuoteEntriesGroup.hasNext())
    {
-        e.skip();
-    });
-    noQuoteSets().forEach([](NoQuoteSets e)
+        noQuoteEntriesGroup.next().skip();
+    }
+    auto &noQuoteSetsGroup { noQuoteSets() };
+    while (noQuoteSetsGroup.hasNext())
    {
-        e.skip();
-    });
+        noQuoteSetsGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_QUOTECXLSTATUS_H_
 #define _ILINKBINARY_QUOTECXLSTATUS_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class QuoteCxlStatus
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_QUOTECXLTYP_H_
 #define _ILINKBINARY_QUOTECXLTYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class QuoteCxlTyp
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_QUOTETYP_H_
 #define _ILINKBINARY_QUOTETYP_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class QuoteTyp
@@ -7,7 +7,5 @@ To generate:

 Download sbe-all-[version].jar from sbe-logic github releases.

-docker run --rm -it -w /work -v $PWD:/work java java -Dsbe.output.dir=/work -Dsbe.generate.ir="false" -Dsbe.target.language=cpp -jar sbe-all-1.16.1.jar ilinkbinary.xml
-#docker run --rm -it -w /work -v $PWD:/work java java -Dsbe.output.dir=/work -Dsbe.generate.ir="false" -Dsbe.target.language=uk.co.real_logic.sbe.generation.rust.Rust -jar sbe-all-1.16.1.jar ilinkbinary.xml
-
+docker run --rm -it -w /work -v $PWD:/work eclipse-temurin:17-jdk-jammy java -Dsbe.output.dir=/work -Dsbe.generate.ir="false" -Dsbe.target.language=cpp -jar sbe-all-1.27.0.jar ilinkbinary.xml

@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_RFQSIDE_H_
 #define _ILINKBINARY_RFQSIDE_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class RFQSide
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_REQRESULT_H_
 #define _ILINKBINARY_REQRESULT_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class ReqResult
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(55);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(543);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = RequestForQuote543(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    RequestForQuote543 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -1286,7 +1293,7 @@ public:
            return *this;
        }

-        inline std::uint64_t resetCountToIndex() SBE_NOEXCEPT
+        inline std::uint64_t resetCountToIndex()
        {
            m_count = m_index;
            GroupSize dimensions(m_buffer, m_initialPosition, m_bufferLength, m_actingVersion);
@@ -1294,17 +1301,6 @@ public:
            return m_count;
        }

-    #if __cplusplus < 201103L
-        template<class Func> inline void forEach(Func& func)
-        {
-            while (hasNext())
-            {
-                next();
-                func(*this);
-            }
-        }
-
-    #else
        template<class Func> inline void forEach(Func &&func)
        {
            while (hasNext())
@@ -1314,7 +1310,6 @@ public:
            }
        }

-    #endif

        SBE_NODISCARD static const char *SecurityIDMetaAttribute(const MetaAttribute metaAttribute) SBE_NOEXCEPT
        {
@@ -1608,8 +1603,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, RequestForQuote543 _writer)
 {
-    RequestForQuote543 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    RequestForQuote543 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "RequestForQuote543", )";
    builder << R"("sbeTemplateId": )";
@@ -1653,7 +1653,8 @@ friend std::basic_ostream<CharT, Traits>& operator << (
    {
        bool atLeastOne = false;
        builder << R"("NoRelatedSym": [)";
-        writer.noRelatedSym().forEach([&](NoRelatedSym& noRelatedSym)
+        writer.noRelatedSym().forEach(
+            [&](NoRelatedSym &noRelatedSym)
            {
                if (atLeastOne)
                {
@@ -1672,10 +1673,11 @@ friend std::basic_ostream<CharT, Traits>& operator << (

 void skip()
 {
-    noRelatedSym().forEach([](NoRelatedSym e)
+    auto &noRelatedSymGroup { noRelatedSym() };
+    while (noRelatedSymGroup.hasNext())
    {
-        e.skip();
-    });
+        noRelatedSymGroup.next().skip();
+    }
 }

 SBE_NODISCARD static SBE_CONSTEXPR bool isConstLength() SBE_NOEXCEPT
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(358);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(546);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = RequestForQuoteAck546(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    RequestForQuoteAck546 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -2072,8 +2079,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, RequestForQuoteAck546 _writer)
 {
-    RequestForQuoteAck546 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    RequestForQuoteAck546 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "RequestForQuoteAck546", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(31);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(509);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = Retransmission509(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    Retransmission509 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -760,8 +767,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, Retransmission509 _writer)
 {
-    Retransmission509 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    Retransmission509 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "Retransmission509", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(75);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(510);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = RetransmitReject510(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    RetransmitReject510 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -895,8 +902,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, RetransmitReject510 _writer)
 {
-    RetransmitReject510 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    RetransmitReject510 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "RetransmitReject510", )";
    builder << R"("sbeTemplateId": )";
@@ -156,6 +156,7 @@ private:
    std::uint64_t m_bufferLength = 0;
    std::uint64_t m_offset = 0;
    std::uint64_t m_position = 0;
+    std::uint64_t m_actingBlockLength = 0;
    std::uint64_t m_actingVersion = 0;

    inline std::uint64_t *sbePositionPtr() SBE_NOEXCEPT
@@ -167,7 +168,7 @@ public:
    static const std::uint16_t SBE_BLOCK_LENGTH = static_cast<std::uint16_t>(30);
    static const std::uint16_t SBE_TEMPLATE_ID = static_cast<std::uint16_t>(508);
    static const std::uint16_t SBE_SCHEMA_ID = static_cast<std::uint16_t>(8);
-    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(7);
+    static const std::uint16_t SBE_SCHEMA_VERSION = static_cast<std::uint16_t>(8);

    enum MetaAttribute
    {
@@ -200,6 +201,7 @@ public:
        m_bufferLength(bufferLength),
        m_offset(offset),
        m_position(sbeCheckPosition(offset + actingBlockLength)),
+        m_actingBlockLength(actingBlockLength),
        m_actingVersion(actingVersion)
    {
    }
@@ -240,7 +242,7 @@ public:

    SBE_NODISCARD static SBE_CONSTEXPR std::uint16_t sbeSchemaVersion() SBE_NOEXCEPT
    {
-        return static_cast<std::uint16_t>(7);
+        return static_cast<std::uint16_t>(8);
    }

    SBE_NODISCARD static SBE_CONSTEXPR const char *sbeSemanticType() SBE_NOEXCEPT
@@ -286,6 +288,11 @@ public:
        return *this = RetransmitRequest508(buffer, offset, bufferLength, actingBlockLength, actingVersion);
    }

+    RetransmitRequest508 &sbeRewind()
+    {
+        return wrapForDecode(m_buffer, m_offset, m_actingBlockLength, m_actingVersion, m_bufferLength);
+    }
+
    SBE_NODISCARD std::uint64_t sbePosition() const SBE_NOEXCEPT
    {
        return m_position;
@@ -697,8 +704,13 @@ template<typename CharT, typename Traits>
 friend std::basic_ostream<CharT, Traits> & operator << (
    std::basic_ostream<CharT, Traits> &builder, RetransmitRequest508 _writer)
 {
-    RetransmitRequest508 writer(_writer.m_buffer, _writer.m_offset,
-        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);
+    RetransmitRequest508 writer(
+        _writer.m_buffer,
+        _writer.m_offset,
+        _writer.m_bufferLength,
+        _writer.m_actingBlockLength,
+        _writer.m_actingVersion);
+
    builder << '{';
    builder << R"("Name": "RetransmitRequest508", )";
    builder << R"("sbeTemplateId": )";
@@ -2,80 +2,17 @@
 #ifndef _ILINKBINARY_SLEDS_H_
 #define _ILINKBINARY_SLEDS_H_

-#if defined(SBE_HAVE_CMATH)
-/* cmath needed for std::numeric_limits<double>::quiet_NaN() */
-#  include <cmath>
-#  define SBE_FLOAT_NAN std::numeric_limits<float>::quiet_NaN()
-#  define SBE_DOUBLE_NAN std::numeric_limits<double>::quiet_NaN()
-#else
-/* math.h needed for NAN */
-#  include <math.h>
-#  define SBE_FLOAT_NAN NAN
-#  define SBE_DOUBLE_NAN NAN
-#endif
-
-#if __cplusplus >= 201103L
-#  define SBE_CONSTEXPR constexpr
-#  define SBE_NOEXCEPT noexcept
-#else
-#  define SBE_CONSTEXPR
-#  define SBE_NOEXCEPT
-#endif
-
-#if __cplusplus >= 201703L
-#  include <string_view>
-#  define SBE_NODISCARD [[nodiscard]]
-#else
-#  define SBE_NODISCARD
-#endif
-
 #if !defined(__STDC_LIMIT_MACROS)
 #  define __STDC_LIMIT_MACROS 1
 #endif

 #include <cstdint>
-#include <cstring>
 #include <iomanip>
 #include <limits>
 #include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <tuple>
-
-#if defined(WIN32) || defined(_WIN32)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v)
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v)
-#  define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v)
-#  define SBE_BIG_ENDIAN_ENCODE_16(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_32(v) (v)
-#  define SBE_BIG_ENDIAN_ENCODE_64(v) (v)
-#else
-#  error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file."
-#endif
-
-#if defined(SBE_NO_BOUNDS_CHECK)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(_MSC_VER)
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
-#else
-#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
-#endif

 #define SBE_NULLVALUE_INT8 (std::numeric_limits<std::int8_t>::min)()
 #define SBE_NULLVALUE_INT16 (std::numeric_limits<std::int16_t>::min)()
@@ -86,7 +23,6 @@
 #define SBE_NULLVALUE_UINT32 (std::numeric_limits<std::uint32_t>::max)()
 #define SBE_NULLVALUE_UINT64 (std::numeric_limits<std::uint64_t>::max)()

-
 namespace iLinkBinary {

 class SLEDS