diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47b2dfd993..72213e9a52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -577,12 +577,6 @@ jobs:
       - name: Run make install for python
         run: sudo make -C lib/py install
 
-      # - name: Run make install-exec-hook for python
-      #   run: sudo make -C lib/py install-exec-hook
-
-      - name: Run make for python libs
-        run: make -C lib/py
-
       - name: Run make check for python libs
         run: make -C lib/py check
 
@@ -842,7 +836,7 @@ jobs:
         # kotlin cross test are failing -> see THRIFT-5879
         server_lang: ['java', 'go', 'cpp', 'py', 'rb']
         # we always use comma join as many client langs as possible, to reduce the number of jobs
-        client_lang: ['java,kotlin', 'go,cpp', 'py', 'rb']
+        client_lang: ['java,kotlin', 'go,cpp,py', 'rb']
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
diff --git a/LANGUAGES.md b/LANGUAGES.md
index 8bf9a333d5..a92d53043b 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -301,7 +301,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr
 <!-- Since -----------------><td>0.2.0</td>
 <!-- Build Systems ---------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
 <!-- Language Levels -------><td>2.7.12, 3.5.2</td><td>2.7.15, 3.6.8</td>
-<!-- Field types -----------><td><img src="/doc/images/cred.png" alt=""/></td>
+<!-- Field types -----------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
 <!-- Low-Level Transports --><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
 <!-- Transport Wrappers ----><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
 <!-- Protocols -------------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h b/lib/cpp/src/thrift/protocol/TProtocol.h
index 63b959163d..565a8ecba8 100644
--- a/lib/cpp/src/thrift/protocol/TProtocol.h
+++ b/lib/cpp/src/thrift/protocol/TProtocol.h
@@ -784,6 +784,10 @@ uint32_t skip(Protocol_& prot, TType type) {
     result += prot.readListEnd();
     return result;
   }
+  case T_UUID: {
+    TUuid uuid;
+    return prot.readUUID(uuid);
+  }
   default:
     break;
   }
diff --git a/lib/py/setup.py b/lib/py/setup.py
index 2dd2a77aa3..456fd6d342 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -85,6 +85,14 @@ def run_setup(with_binary):
                               'src/ext/binary.cpp',
                               'src/ext/compact.cpp',
                           ],
+                          depends=[
+                              'src/ext/binary.h',
+                              'src/ext/compact.h',
+                              'src/ext/endian.h',
+                              'src/ext/protocol.h',
+                              'src/ext/protocol.tcc',
+                              'src/ext/types.h',
+                          ],
                           include_dirs=include_dirs,
                           )
             ],
@@ -138,6 +146,8 @@ def run_setup(with_binary):
 try:
     with_binary = True
     run_setup(with_binary)
+    sys.exit(0)
+
 except BuildFailed:
     print()
     print('*' * 80)
@@ -146,4 +156,16 @@ def run_setup(with_binary):
     print('*' * 80)
     print()
 
+# Retry but without the binary
+try:
     run_setup(False)
+    sys.exit(0)
+
+except BuildFailed:
+    print()
+    print('*' * 80)
+    print("An error occurred while trying to compile without the C extension enabled")
+    print("Build failed")
+    print('*' * 80)
+    print()
+    sys.exit(1)
diff --git a/lib/py/src/Thrift.py b/lib/py/src/Thrift.py
index 81fe8cf33f..7b28c908c7 100644
--- a/lib/py/src/Thrift.py
+++ b/lib/py/src/Thrift.py
@@ -34,8 +34,7 @@ class TType(object):
     MAP = 13
     SET = 14
     LIST = 15
-    UTF8 = 16
-    UTF16 = 17
+    UUID = 16
 
     _VALUES_TO_NAMES = (
         'STOP',
@@ -54,8 +53,7 @@ class TType(object):
         'MAP',
         'SET',
         'LIST',
-        'UTF8',
-        'UTF16',
+        'UUID',
     )
 
 
diff --git a/lib/py/src/ext/binary.h b/lib/py/src/ext/binary.h
index 960b0d003a..dd7750b49a 100644
--- a/lib/py/src/ext/binary.h
+++ b/lib/py/src/ext/binary.h
@@ -88,6 +88,10 @@ class BinaryProtocol : public ProtocolBase<BinaryProtocol> {
     return encodeValue(value, parsedspec.type, parsedspec.typeargs);
   }
 
+  void writeUuid(char* value) {
+    writeBuffer(value, 16);
+  }
+
   void writeFieldStop() { writeByte(static_cast<uint8_t>(T_STOP)); }
 
   bool readBool(bool& val) {
@@ -159,6 +163,13 @@ class BinaryProtocol : public ProtocolBase<BinaryProtocol> {
     return len;
   }
 
+  int32_t readUuid(char** buf) {
+    if (!readBytes(buf, 16)) {
+      return -1;
+    }
+    return 16;
+  }
+
   int32_t readListBegin(TType& etype) {
     int32_t len;
     uint8_t b = 0;
@@ -206,6 +217,7 @@ class BinaryProtocol : public ProtocolBase<BinaryProtocol> {
     }
     SKIPBYTES(len);
   }
+  bool skipUuid() { SKIPBYTES(16); }
 #undef SKIPBYTES
 
 private:
diff --git a/lib/py/src/ext/compact.cpp b/lib/py/src/ext/compact.cpp
index ae89f2a655..8d13d3d196 100644
--- a/lib/py/src/ext/compact.cpp
+++ b/lib/py/src/ext/compact.cpp
@@ -24,23 +24,26 @@ namespace apache {
 namespace thrift {
 namespace py {
 
+/** Mapping of Compact type to Thrift Type according.
+ * This list must match the TType enum in TEnum.h */
 const uint8_t CompactProtocol::TTypeToCType[] = {
-    CT_STOP,         // T_STOP
-    0,               // unused
-    CT_BOOLEAN_TRUE, // T_BOOL
-    CT_BYTE,         // T_BYTE
-    CT_DOUBLE,       // T_DOUBLE
-    0,               // unused
-    CT_I16,          // T_I16
-    0,               // unused
-    CT_I32,          // T_I32
-    0,               // unused
-    CT_I64,          // T_I64
-    CT_BINARY,       // T_STRING
-    CT_STRUCT,       // T_STRUCT
-    CT_MAP,          // T_MAP
-    CT_SET,          // T_SET
-    CT_LIST,         // T_LIST
+/*  0 */    CT_STOP,         // T_STOP
+/*  1 */    0,               // unused
+/*  2 */    CT_BOOLEAN_TRUE, // T_BOOL
+/*  3 */    CT_BYTE,         // T_BYTE
+/*  4 */    CT_DOUBLE,       // T_DOUBLE
+/*  5 */    0,               // unused
+/*  6 */    CT_I16,          // T_I16
+/*  7 */    0,               // unused
+/*  8 */    CT_I32,          // T_I32
+/*  9 */    0,               // unused
+/* 10 */    CT_I64,          // T_I64
+/* 11 */    CT_BINARY,       // T_STRING
+/* 12 */    CT_STRUCT,       // T_STRUCT
+/* 13 */    CT_MAP,          // T_MAP
+/* 14 */    CT_SET,          // T_SET
+/* 15 */    CT_LIST,         // T_LIST
+/* 16 */    CT_UUID,         // T_UUID
 };
 
 bool CompactProtocol::readFieldBegin(TType& type, int16_t& tag) {
@@ -98,6 +101,8 @@ TType CompactProtocol::getTType(uint8_t type) {
     return T_MAP;
   case CT_STRUCT:
     return T_STRUCT;
+  case CT_UUID:
+    return T_UUID;
   default:
     PyErr_Format(PyExc_TypeError, "don't know what type: %d", type);
     return static_cast<TType>(-1);
diff --git a/lib/py/src/ext/compact.h b/lib/py/src/ext/compact.h
index 8f72b09259..0d8946b344 100644
--- a/lib/py/src/ext/compact.h
+++ b/lib/py/src/ext/compact.h
@@ -104,6 +104,10 @@ class CompactProtocol : public ProtocolBase<CompactProtocol> {
 
   void writeFieldStop() { writeByte(0); }
 
+  void writeUuid(char* value) {
+    writeBuffer(value, 16);
+  }
+
   bool readBool(bool& val) {
     if (readBool_.exists) {
       readBool_.exists = false;
@@ -231,6 +235,13 @@ class CompactProtocol : public ProtocolBase<CompactProtocol> {
   }
   bool readFieldBegin(TType& type, int16_t& tag);
 
+  bool readUuid(char** buf) {
+    if (!readBytes(buf, 16)) {
+      return false;
+    }
+    return true;
+  }
+
   bool skipBool() {
     bool val;
     return readBool(val);
@@ -263,6 +274,9 @@ class CompactProtocol : public ProtocolBase<CompactProtocol> {
     }
     SKIPBYTES(len);
   }
+  bool skipUuid() {
+    SKIPBYTES(16);
+  }
 #undef SKIPBYTES
 
 private:
@@ -279,7 +293,8 @@ class CompactProtocol : public ProtocolBase<CompactProtocol> {
     CT_LIST = 0x09,
     CT_SET = 0x0A,
     CT_MAP = 0x0B,
-    CT_STRUCT = 0x0C
+    CT_STRUCT = 0x0C,
+    CT_UUID = 0x0D,
   };
 
   static const uint8_t TTypeToCType[];
@@ -288,7 +303,7 @@ class CompactProtocol : public ProtocolBase<CompactProtocol> {
 
   int toCompactType(TType type) {
     int i = static_cast<int>(type);
-    return i < 16 ? TTypeToCType[i] : -1;
+    return i <= 16 ? TTypeToCType[i] : -1;
   }
 
   uint32_t toZigZag(int32_t val) { return (val >> 31) ^ (val << 1); }
diff --git a/lib/py/src/ext/module.cpp b/lib/py/src/ext/module.cpp
index a1b0e5633e..e2b540e6f6 100644
--- a/lib/py/src/ext/module.cpp
+++ b/lib/py/src/ext/module.cpp
@@ -38,6 +38,8 @@
 PyObject* INTERN_STRING(TFrozenDict);
 PyObject* INTERN_STRING(cstringio_buf);
 PyObject* INTERN_STRING(cstringio_refill);
+PyObject* INTERN_STRING(UUID);
+PyObject* INTERN_STRING(bytes);
 static PyObject* INTERN_STRING(string_length_limit);
 static PyObject* INTERN_STRING(container_length_limit);
 static PyObject* INTERN_STRING(trans);
@@ -186,6 +188,8 @@ void initfastbinary() {
   INIT_INTERN_STRING(string_length_limit);
   INIT_INTERN_STRING(container_length_limit);
   INIT_INTERN_STRING(trans);
+  INIT_INTERN_STRING(UUID);
+  INIT_INTERN_STRING(bytes);
 #undef INIT_INTERN_STRING
 
   PyObject* module =
diff --git a/lib/py/src/ext/protocol.tcc b/lib/py/src/ext/protocol.tcc
index aad5a3c88e..b517c381ee 100644
--- a/lib/py/src/ext/protocol.tcc
+++ b/lib/py/src/ext/protocol.tcc
@@ -542,10 +542,27 @@ bool ProtocolBase<Impl>::encodeValue(PyObject* value, TType type, PyObject* type
     return true;
   }
 
+  case T_UUID: {
+    ScopedPyObject instval(PyObject_GetAttr(value, INTERN_STRING(bytes)));
+    if (!instval) {
+        return false;
+    }
+
+    Py_ssize_t size;
+    char* buffer;
+    if (PyBytes_AsStringAndSize(instval.get(), &buffer, &size) < 0) {
+        return false;
+    }
+    if (size != 16) {
+        PyErr_SetString(PyExc_TypeError, "uuid.bytes must be exactly 16 bytes long");
+        return false;
+    }
+    impl()->writeUuid(buffer);
+    return true;
+  }
+
   case T_STOP:
   case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
   case T_U64:
   default:
     PyErr_Format(PyExc_TypeError, "Unexpected TType for encodeValue: %d", type);
@@ -625,11 +642,12 @@ bool ProtocolBase<Impl>::skip(TType type) {
     }
     return true;
   }
+  case T_UUID: {
+    return impl()->skipUuid();
+  }
 
   case T_STOP:
   case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
   case T_U64:
   default:
     PyErr_Format(PyExc_TypeError, "Unexpected TType for skip: %d", type);
@@ -816,10 +834,36 @@ PyObject* ProtocolBase<Impl>::decodeValue(TType type, PyObject* typeargs) {
     return readStruct(Py_None, parsedargs.klass, parsedargs.spec);
   }
 
+  case T_UUID: {
+    char* buf = nullptr;
+    if(!impl()->readUuid(&buf)) {
+      return nullptr;
+    }
+
+    if(!UuidModule) {
+      UuidModule = PyImport_ImportModule("uuid");
+      if (!UuidModule)
+        return nullptr;
+    }
+
+    ScopedPyObject cls(PyObject_GetAttr(UuidModule, INTERN_STRING(UUID)));
+    if (!cls) {
+        return nullptr;
+    }
+
+    ScopedPyObject pyBytes(PyBytes_FromStringAndSize(buf, 16));
+    if (!pyBytes) {
+        return nullptr;
+    }
+
+    ScopedPyObject args(PyTuple_New(0));
+    ScopedPyObject kwargs(Py_BuildValue("{O:O}", INTERN_STRING(bytes), pyBytes.get()));
+    ScopedPyObject ret(PyObject_Call(cls.get(), args.get(), kwargs.get()));
+    return ret.release();
+  }
+
   case T_STOP:
   case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
   case T_U64:
   default:
     PyErr_Format(PyExc_TypeError, "Unexpected TType for decodeValue: %d", type);
diff --git a/lib/py/src/ext/types.cpp b/lib/py/src/ext/types.cpp
index 0c20e56224..a7ccd0a8c6 100644
--- a/lib/py/src/ext/types.cpp
+++ b/lib/py/src/ext/types.cpp
@@ -26,6 +26,7 @@ namespace thrift {
 namespace py {
 
 PyObject* ThriftModule = nullptr;
+PyObject* UuidModule = nullptr;
 
 #if PY_MAJOR_VERSION < 3
 char refill_signature[] = {'s', '#', 'i'};
diff --git a/lib/py/src/ext/types.h b/lib/py/src/ext/types.h
index 9b45dd065f..2848b28f0b 100644
--- a/lib/py/src/ext/types.h
+++ b/lib/py/src/ext/types.h
@@ -48,6 +48,8 @@ extern "C" {
 extern PyObject* INTERN_STRING(TFrozenDict);
 extern PyObject* INTERN_STRING(cstringio_buf);
 extern PyObject* INTERN_STRING(cstringio_refill);
+extern PyObject* INTERN_STRING(UUID);
+extern PyObject* INTERN_STRING(bytes);
 }
 
 namespace apache {
@@ -55,6 +57,7 @@ namespace thrift {
 namespace py {
 
 extern PyObject* ThriftModule;
+extern PyObject* UuidModule;
 
 // Stolen out of TProtocol.h.
 // It would be a huge pain to have both get this from one place.
@@ -76,8 +79,7 @@ enum TType {
   T_MAP = 13,
   T_SET = 14,
   T_LIST = 15,
-  T_UTF8 = 16,
-  T_UTF16 = 17
+  T_UUID = 16,
 };
 
 // replace with unique_ptr when we're OK with C++11
diff --git a/lib/py/src/protocol/TBinaryProtocol.py b/lib/py/src/protocol/TBinaryProtocol.py
index af64ec1035..b73e3c9394 100644
--- a/lib/py/src/protocol/TBinaryProtocol.py
+++ b/lib/py/src/protocol/TBinaryProtocol.py
@@ -18,6 +18,7 @@
 #
 
 from struct import pack, unpack
+import uuid
 
 from .TProtocol import TType, TProtocolBase, TProtocolException, TProtocolFactory
 
@@ -131,6 +132,9 @@ def writeBinary(self, str):
         self.writeI32(len(str))
         self.trans.write(str)
 
+    def writeUuid(self, uuid):
+        self.trans.write(uuid.bytes)
+
     def readMessageBegin(self):
         sz = self.readI32()
         if sz < 0:
@@ -235,6 +239,11 @@ def readBinary(self):
         s = self.trans.readAll(size)
         return s
 
+    def readUuid(self):
+        buff = self.trans.readAll(16)
+        val = uuid.UUID(bytes=buff)
+        return val
+
 
 class TBinaryProtocolFactory(TProtocolFactory):
     def __init__(self, strictRead=False, strictWrite=True, **kwargs):
diff --git a/lib/py/src/protocol/TCompactProtocol.py b/lib/py/src/protocol/TCompactProtocol.py
index a3527cd47a..b58095a000 100644
--- a/lib/py/src/protocol/TCompactProtocol.py
+++ b/lib/py/src/protocol/TCompactProtocol.py
@@ -19,6 +19,7 @@
 
 from .TProtocol import TType, TProtocolBase, TProtocolException, TProtocolFactory, checkIntegerLimits
 from struct import pack, unpack
+import uuid
 
 __all__ = ['TCompactProtocol', 'TCompactProtocolFactory']
 
@@ -80,6 +81,7 @@ def readVarint(trans):
         shift += 7
 
 
+# As per TCompactProtocol.tcc
 class CompactType(object):
     STOP = 0x00
     TRUE = 0x01
@@ -94,6 +96,7 @@ class CompactType(object):
     SET = 0x0A
     MAP = 0x0B
     STRUCT = 0x0C
+    UUID = 0x0D
 
 
 CTYPES = {
@@ -109,6 +112,7 @@ class CompactType(object):
     TType.LIST: CompactType.LIST,
     TType.SET: CompactType.SET,
     TType.MAP: CompactType.MAP,
+    TType.UUID: CompactType.UUID,
 }
 
 TTYPES = {}
@@ -276,6 +280,10 @@ def writeI64(self, i64):
     def writeDouble(self, dub):
         self.trans.write(pack('<d', dub))
 
+    @writer
+    def writeUuid(self, uuid):
+        self.trans.write(uuid.bytes)
+
     def __writeBinary(self, s):
         self.__writeSize(len(s))
         self.trans.write(s)
@@ -416,6 +424,12 @@ def readDouble(self):
         val, = unpack('<d', buff)
         return val
 
+    @reader
+    def readUuid(self):
+        buff = self.trans.readAll(16)
+        val = uuid.UUID(bytes=buff)
+        return val
+
     def __readBinary(self):
         size = self.__readSize()
         self._check_string_length(size)
diff --git a/lib/py/src/protocol/TJSONProtocol.py b/lib/py/src/protocol/TJSONProtocol.py
index 004a40a083..6782eeb26f 100644
--- a/lib/py/src/protocol/TJSONProtocol.py
+++ b/lib/py/src/protocol/TJSONProtocol.py
@@ -21,6 +21,7 @@
                         TProtocolFactory, checkIntegerLimits)
 import base64
 import math
+import uuid
 
 
 __all__ = ['TJSONProtocol',
@@ -64,6 +65,7 @@
 }
 NUMERIC_CHAR = b'+-.0123456789Ee'
 
+# Type names as TJSONProtocol.cpp
 CTYPES = {
     TType.BOOL: 'tf',
     TType.BYTE: 'i8',
@@ -76,6 +78,7 @@
     TType.LIST: 'lst',
     TType.SET: 'set',
     TType.MAP: 'map',
+    TType.UUID: 'uid',
 }
 
 JTYPES = {}
@@ -480,6 +483,11 @@ def readString(self):
     def readBinary(self):
         return self.readJSONBase64()
 
+    def readUuid(self):
+        buff = self.readJSONString(False)
+        val = uuid.UUID(buff)
+        return val
+
     def writeMessageBegin(self, name, request_type, seqid):
         self.resetWriteContext()
         self.writeJSONArrayStart()
@@ -565,6 +573,9 @@ def writeString(self, string):
     def writeBinary(self, binary):
         self.writeJSONBase64(binary)
 
+    def writeUuid(self, uuid):
+        self.writeJSONString(str(uuid))
+
 
 class TJSONProtocolFactory(TProtocolFactory):
     def getProtocol(self, trans):
@@ -659,6 +670,9 @@ def writeString(self, string):
     def writeBinary(self, binary):
         self.writeJSONBase64(binary)
 
+    def writeUuid(self, uuid):
+        self.writeJSONString(str(uuid))
+
 
 class TSimpleJSONProtocolFactory(TProtocolFactory):
 
diff --git a/lib/py/src/protocol/TProtocol.py b/lib/py/src/protocol/TProtocol.py
index a0d145266d..975cbf5915 100644
--- a/lib/py/src/protocol/TProtocol.py
+++ b/lib/py/src/protocol/TProtocol.py
@@ -117,7 +117,10 @@ def writeDouble(self, dub):
     def writeString(self, str_val):
         self.writeBinary(bytes(str_val, 'utf-8'))
 
-    def writeBinary(self, str_val):
+    def writeBinary(self, uuid):
+        pass
+
+    def writeUuid(self, str_val):
         pass
 
     def readMessageBegin(self):
@@ -180,6 +183,9 @@ def readString(self):
     def readBinary(self):
         pass
 
+    def readUuid(self):
+        pass
+
     def skip(self, ttype):
         if ttype == TType.BOOL:
             self.readBool()
@@ -220,6 +226,8 @@ def skip(self, ttype):
             for i in range(size):
                 self.skip(etype)
             self.readListEnd()
+        elif ttype == TType.UUID:
+            self.readUuid()
         else:
             raise TProtocolException(
                 TProtocolException.INVALID_DATA,
@@ -243,8 +251,7 @@ def skip(self, ttype):
         ('readContainerMap', 'writeContainerMap', True),  # 13 TType.MAP
         ('readContainerSet', 'writeContainerSet', True),  # 14 TType.SET
         ('readContainerList', 'writeContainerList', True),  # 15 TType.LIST
-        (None, None, False),  # 16 TType.UTF8 # TODO: handle utf8 types?
-        (None, None, False)  # 17 TType.UTF16 # TODO: handle utf16 types?
+        ('readUuid', 'writeUuid', False),  # 16 TType.UUID
     )
 
     def _ttype_handlers(self, ttype, spec):
diff --git a/lib/py/test/thrift_TBinaryProtocol.py b/lib/py/test/thrift_TBinaryProtocol.py
index c4777ad831..e84bfe1e84 100644
--- a/lib/py/test/thrift_TBinaryProtocol.py
+++ b/lib/py/test/thrift_TBinaryProtocol.py
@@ -18,6 +18,7 @@
 #
 
 import unittest
+import uuid
 
 import _import_local_thrift  # noqa
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
@@ -52,6 +53,9 @@ def testNaked(type, data):
     if type.capitalize() == 'Bool':
         protocol.writeBool(data)
 
+    if type.capitalize() == 'Uuid':
+        protocol.writeUuid(data)
+
     transport.flush()
     data_r = buf.getvalue()
     buf = TTransport.TMemoryBuffer(data_r)
@@ -81,9 +85,12 @@ def testNaked(type, data):
     if type.capitalize() == 'Bool':
         return protocol.readBool()
 
+    if type.capitalize() == 'Uuid':
+        return protocol.readUuid()
+
 
 def testField(type, data):
-    TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12}
+    TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12, "Uuid": 13}
     buf = TTransport.TMemoryBuffer()
     transport = TTransport.TBufferedTransportFactory().getTransport(buf)
     protocol = TBinaryProtocol(transport)
@@ -113,6 +120,9 @@ def testField(type, data):
     if type.capitalize() == 'Bool':
         protocol.writeBool(data)
 
+    if type.capitalize() == 'Uuid':
+        protocol.writeUuid(data)
+
     protocol.writeFieldEnd()
     protocol.writeStructEnd()
 
@@ -148,6 +158,9 @@ def testField(type, data):
     if type.capitalize() == 'Bool':
         return protocol.readBool()
 
+    if type.capitalize() == 'Uuid':
+        return protocol.readUuid()
+
     protocol.readFieldEnd()
     protocol.readStructEnd()
 
@@ -245,6 +258,8 @@ def test_TBinaryProtocol_write_read(self):
             self.assertEqual(True, testField('Bool', True))
             self.assertEqual(3.1415926, testNaked("Double", 3.1415926))
             self.assertEqual("hello thrift", testNaked("String", "hello thrift"))
+            self.assertEqual(uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}'), testNaked("Uuid", uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')))
+            self.assertEqual(uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}'), testField("Uuid", uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')))
 
             TMessageType = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
             test_data = [("short message name", TMessageType['T_CALL'], 0),
diff --git a/lib/py/test/thrift_TCompactProtocol.py b/lib/py/test/thrift_TCompactProtocol.py
index 1d6af8ee2a..34357024bd 100644
--- a/lib/py/test/thrift_TCompactProtocol.py
+++ b/lib/py/test/thrift_TCompactProtocol.py
@@ -21,6 +21,7 @@
 from thrift.protocol import TCompactProtocol
 from thrift.transport import TTransport
 import unittest
+import uuid
 
 CLEAR = 0
 FIELD_WRITE = 1
@@ -70,6 +71,10 @@ def testNaked(type, data):
         protocol.state = CONTAINER_WRITE
         protocol.writeBool(True)
 
+    if type.capitalize() == 'Uuid':
+        protocol.state = CONTAINER_WRITE
+        protocol.writeUuid(data)
+
     transport.flush()
     data_r = buf.getvalue()
     buf = TTransport.TMemoryBuffer(data_r)
@@ -107,9 +112,13 @@ def testNaked(type, data):
         protocol.state = CONTAINER_READ
         return protocol.readBool()
 
+    if type.capitalize() == 'Uuid':
+        protocol.state = CONTAINER_READ
+        return protocol.readUuid()
+
 
 def testField(type, data):
-    TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12}
+    TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12, "Uuid": 13}
     buf = TTransport.TMemoryBuffer()
     transport = TTransport.TBufferedTransportFactory().getTransport(buf)
     protocol = TCompactProtocol.TCompactProtocol(transport)
@@ -139,6 +148,9 @@ def testField(type, data):
     elif type.capitalize() == 'Bool':
         protocol.writeBool(data)
 
+    if type.capitalize() == 'Uuid':
+        protocol.writeUuid(data)
+
     protocol.writeFieldEnd()
     protocol.writeStructEnd()
 
@@ -174,6 +186,9 @@ def testField(type, data):
     elif type.capitalize() == 'Bool':
         return protocol.readBool()
 
+    if type.capitalize() == 'Uuid':
+        return protocol.readUuid()
+
     protocol.readFieldEnd()
     protocol.readStructEnd()
 
@@ -268,6 +283,9 @@ def test_TCompactProtocol_write_read(self):
             self.assertEqual(True, testField('Bool', True))
             self.assertEqual(3.14159261, testField('Double', 3.14159261))
             self.assertEqual("hello thrift", testField('String', "hello thrift"))
+            self.assertEqual(uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}'), testNaked("Uuid", uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')))
+            self.assertEqual(uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}'), testField("Uuid", uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')))
+
             TMessage = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
             test_data = [("short message name", TMessage["T_CALL"], 0),
                          ("1", TMessage["T_REPLY"], 12345),
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 6afe00c4cb..41b29c9768 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -27,42 +27,6 @@
   "cl-rs_multi-binary_framed-ip",
   "cl-rs_multi_buffered-ip",
   "cl-rs_multi_framed-ip",
-  "cpp-cpp_binary_websocket-domain",
-  "cpp-cpp_binary_websocket-ip",
-  "cpp-cpp_binary_websocket-ip-ssl",
-  "cpp-cpp_compact_websocket-domain",
-  "cpp-cpp_compact_websocket-ip",
-  "cpp-cpp_compact_websocket-ip-ssl",
-  "cpp-cpp_header_websocket-domain",
-  "cpp-cpp_header_websocket-ip",
-  "cpp-cpp_header_websocket-ip-ssl",
-  "cpp-cpp_json_websocket-domain",
-  "cpp-cpp_json_websocket-ip",
-  "cpp-cpp_json_websocket-ip-ssl",
-  "cpp-cpp_multi-binary_websocket-domain",
-  "cpp-cpp_multi-binary_websocket-ip",
-  "cpp-cpp_multi-binary_websocket-ip-ssl",
-  "cpp-cpp_multi_websocket-domain",
-  "cpp-cpp_multi_websocket-ip",
-  "cpp-cpp_multi_websocket-ip-ssl",
-  "cpp-cpp_multic-compact_websocket-domain",
-  "cpp-cpp_multic-compact_websocket-ip",
-  "cpp-cpp_multic-compact_websocket-ip-ssl",
-  "cpp-cpp_multic_websocket-domain",
-  "cpp-cpp_multic_websocket-ip",
-  "cpp-cpp_multic_websocket-ip-ssl",
-  "cpp-cpp_multih-header_websocket-domain",
-  "cpp-cpp_multih-header_websocket-ip",
-  "cpp-cpp_multih-header_websocket-ip-ssl",
-  "cpp-cpp_multih_websocket-domain",
-  "cpp-cpp_multih_websocket-ip",
-  "cpp-cpp_multih_websocket-ip-ssl",
-  "cpp-cpp_multij-json_websocket-domain",
-  "cpp-cpp_multij-json_websocket-ip",
-  "cpp-cpp_multij-json_websocket-ip-ssl",
-  "cpp-cpp_multij_websocket-domain",
-  "cpp-cpp_multij_websocket-ip",
-  "cpp-cpp_multij_websocket-ip-ssl",
   "cpp-dart_binary_http-ip",
   "cpp-dart_compact_http-ip",
   "cpp-dart_json_http-ip",
@@ -174,100 +138,57 @@
   "cpp-py_binary-accel_http-domain",
   "cpp-py_binary-accel_http-ip",
   "cpp-py_binary-accel_http-ip-ssl",
-  "cpp-py_binary-accel_zlib-ip-ssl",
   "cpp-py_binary_http-domain",
   "cpp-py_binary_http-ip",
   "cpp-py_binary_http-ip-ssl",
-  "cpp-py_binary_zlib-ip-ssl",
   "cpp-py_compact-accelc_http-domain",
   "cpp-py_compact-accelc_http-ip",
   "cpp-py_compact-accelc_http-ip-ssl",
-  "cpp-py_compact-accelc_zlib-ip-ssl",
   "cpp-py_compact_http-domain",
   "cpp-py_compact_http-ip",
   "cpp-py_compact_http-ip-ssl",
-  "cpp-py_compact_zlib-ip-ssl",
-  "cpp-py_header_buffered-ip-ssl",
-  "cpp-py_header_framed-ip-ssl",
   "cpp-py_header_http-domain",
   "cpp-py_header_http-ip",
   "cpp-py_header_http-ip-ssl",
-  "cpp-py_header_zlib-ip-ssl",
   "cpp-py_json_http-domain",
   "cpp-py_json_http-ip",
   "cpp-py_json_http-ip-ssl",
-  "cpp-py_multi-accel_buffered-ip-ssl",
-  "cpp-py_multi-accel_framed-ip-ssl",
   "cpp-py_multi-accel_http-domain",
   "cpp-py_multi-accel_http-ip",
   "cpp-py_multi-accel_http-ip-ssl",
-  "cpp-py_multi-accel_zlib-ip-ssl",
-  "cpp-py_multi-binary_buffered-ip-ssl",
-  "cpp-py_multi-binary_framed-ip-ssl",
   "cpp-py_multi-binary_http-domain",
   "cpp-py_multi-binary_http-ip",
   "cpp-py_multi-binary_http-ip-ssl",
-  "cpp-py_multi-binary_zlib-ip-ssl",
-  "cpp-py_multi-multia_buffered-ip-ssl",
-  "cpp-py_multi-multia_framed-ip-ssl",
   "cpp-py_multi-multia_http-domain",
   "cpp-py_multi-multia_http-ip",
   "cpp-py_multi-multia_http-ip-ssl",
-  "cpp-py_multi-multia_zlib-ip-ssl",
-  "cpp-py_multi_buffered-ip-ssl",
-  "cpp-py_multi_framed-ip-ssl",
   "cpp-py_multi_http-domain",
   "cpp-py_multi_http-ip",
   "cpp-py_multi_http-ip-ssl",
-  "cpp-py_multi_zlib-ip-ssl",
-  "cpp-py_multic-accelc_buffered-ip-ssl",
-  "cpp-py_multic-accelc_framed-ip-ssl",
   "cpp-py_multic-accelc_http-domain",
   "cpp-py_multic-accelc_http-ip",
   "cpp-py_multic-accelc_http-ip-ssl",
-  "cpp-py_multic-accelc_zlib-ip-ssl",
-  "cpp-py_multic-compact_buffered-ip-ssl",
-  "cpp-py_multic-compact_framed-ip-ssl",
   "cpp-py_multic-compact_http-domain",
   "cpp-py_multic-compact_http-ip",
   "cpp-py_multic-compact_http-ip-ssl",
-  "cpp-py_multic-compact_zlib-ip-ssl",
-  "cpp-py_multic-multiac_buffered-ip-ssl",
-  "cpp-py_multic-multiac_framed-ip-ssl",
   "cpp-py_multic-multiac_http-domain",
   "cpp-py_multic-multiac_http-ip",
   "cpp-py_multic-multiac_http-ip-ssl",
-  "cpp-py_multic-multiac_zlib-ip-ssl",
-  "cpp-py_multic_buffered-ip-ssl",
-  "cpp-py_multic_framed-ip-ssl",
   "cpp-py_multic_http-domain",
   "cpp-py_multic_http-ip",
   "cpp-py_multic_http-ip-ssl",
-  "cpp-py_multic_zlib-ip-ssl",
-  "cpp-py_multih-header_buffered-ip-ssl",
-  "cpp-py_multih-header_framed-ip-ssl",
   "cpp-py_multih-header_http-domain",
   "cpp-py_multih-header_http-ip",
   "cpp-py_multih-header_http-ip-ssl",
-  "cpp-py_multih-header_zlib-ip-ssl",
-  "cpp-py_multih_buffered-ip-ssl",
-  "cpp-py_multih_framed-ip-ssl",
   "cpp-py_multih_http-domain",
   "cpp-py_multih_http-ip",
   "cpp-py_multih_http-ip-ssl",
-  "cpp-py_multih_zlib-ip-ssl",
-  "cpp-py_multij-json_buffered-ip-ssl",
-  "cpp-py_multij-json_framed-ip-ssl",
   "cpp-py_multij-json_http-domain",
   "cpp-py_multij-json_http-ip",
   "cpp-py_multij-json_http-ip-ssl",
-  "cpp-py_multij-json_zlib-ip-ssl",
-  "cpp-py_multij_buffered-ip-ssl",
-  "cpp-py_multij_framed-ip-ssl",
   "cpp-py_multij_http-domain",
   "cpp-py_multij_http-ip",
   "cpp-py_multij_http-ip-ssl",
-  "cpp-py_multij_zlib-ip-ssl",
   "d-cl_binary_buffered-ip",
   "d-cl_binary_framed-ip",
   "d-cpp_binary_buffered-ip",
@@ -793,222 +714,78 @@
   "perl-netstd_multi-binary_buffered-ip-ssl",
   "perl-netstd_multi-binary_framed-ip",
   "perl-netstd_multi-binary_framed-ip-ssl",
-  "py-cpp_accel-binary_buffered-domain",
-  "py-cpp_accel-binary_buffered-ip",
-  "py-cpp_accel-binary_buffered-ip-ssl",
-  "py-cpp_accel-binary_framed-domain",
-  "py-cpp_accel-binary_framed-ip",
-  "py-cpp_accel-binary_framed-ip-ssl",
   "py-cpp_accel-binary_http-domain",
   "py-cpp_accel-binary_http-ip",
   "py-cpp_accel-binary_http-ip-ssl",
   "py-cpp_accel-binary_zlib-domain",
   "py-cpp_accel-binary_zlib-ip",
   "py-cpp_accel-binary_zlib-ip-ssl",
-  "py-cpp_accelc-compact_buffered-domain",
-  "py-cpp_accelc-compact_buffered-ip",
-  "py-cpp_accelc-compact_buffered-ip-ssl",
-  "py-cpp_accelc-compact_framed-domain",
-  "py-cpp_accelc-compact_framed-ip",
-  "py-cpp_accelc-compact_framed-ip-ssl",
   "py-cpp_accelc-compact_http-domain",
   "py-cpp_accelc-compact_http-ip",
   "py-cpp_accelc-compact_http-ip-ssl",
   "py-cpp_accelc-compact_zlib-domain",
   "py-cpp_accelc-compact_zlib-ip",
   "py-cpp_accelc-compact_zlib-ip-ssl",
-  "py-cpp_binary_buffered-domain",
-  "py-cpp_binary_buffered-ip",
-  "py-cpp_binary_buffered-ip-ssl",
-  "py-cpp_binary_framed-domain",
-  "py-cpp_binary_framed-ip",
-  "py-cpp_binary_framed-ip-ssl",
   "py-cpp_binary_http-domain",
   "py-cpp_binary_http-ip",
   "py-cpp_binary_http-ip-ssl",
-  "py-cpp_binary_zlib-domain",
-  "py-cpp_binary_zlib-ip",
-  "py-cpp_binary_zlib-ip-ssl",
-  "py-cpp_compact_buffered-domain",
-  "py-cpp_compact_buffered-ip",
-  "py-cpp_compact_buffered-ip-ssl",
-  "py-cpp_compact_framed-domain",
-  "py-cpp_compact_framed-ip",
-  "py-cpp_compact_framed-ip-ssl",
   "py-cpp_compact_http-domain",
   "py-cpp_compact_http-ip",
   "py-cpp_compact_http-ip-ssl",
-  "py-cpp_compact_zlib-domain",
-  "py-cpp_compact_zlib-ip",
-  "py-cpp_compact_zlib-ip-ssl",
-  "py-cpp_header_buffered-domain",
-  "py-cpp_header_buffered-ip",
-  "py-cpp_header_buffered-ip-ssl",
-  "py-cpp_header_framed-domain",
-  "py-cpp_header_framed-ip",
-  "py-cpp_header_framed-ip-ssl",
   "py-cpp_header_http-domain",
   "py-cpp_header_http-ip",
   "py-cpp_header_http-ip-ssl",
-  "py-cpp_header_zlib-domain",
-  "py-cpp_header_zlib-ip",
-  "py-cpp_header_zlib-ip-ssl",
-  "py-cpp_json_buffered-domain",
-  "py-cpp_json_buffered-ip",
-  "py-cpp_json_buffered-ip-ssl",
-  "py-cpp_json_framed-domain",
-  "py-cpp_json_framed-ip",
-  "py-cpp_json_framed-ip-ssl",
   "py-cpp_json_http-domain",
   "py-cpp_json_http-ip",
   "py-cpp_json_http-ip-ssl",
-  "py-cpp_json_zlib-domain",
-  "py-cpp_json_zlib-ip",
-  "py-cpp_json_zlib-ip-ssl",
-  "py-cpp_multi-binary_buffered-domain",
-  "py-cpp_multi-binary_buffered-ip",
-  "py-cpp_multi-binary_buffered-ip-ssl",
-  "py-cpp_multi-binary_framed-domain",
-  "py-cpp_multi-binary_framed-ip",
-  "py-cpp_multi-binary_framed-ip-ssl",
   "py-cpp_multi-binary_http-domain",
   "py-cpp_multi-binary_http-ip",
   "py-cpp_multi-binary_http-ip-ssl",
-  "py-cpp_multi-binary_zlib-domain",
-  "py-cpp_multi-binary_zlib-ip",
-  "py-cpp_multi-binary_zlib-ip-ssl",
-  "py-cpp_multi_buffered-domain",
-  "py-cpp_multi_buffered-ip",
-  "py-cpp_multi_buffered-ip-ssl",
-  "py-cpp_multi_framed-domain",
-  "py-cpp_multi_framed-ip",
-  "py-cpp_multi_framed-ip-ssl",
   "py-cpp_multi_http-domain",
   "py-cpp_multi_http-ip",
   "py-cpp_multi_http-ip-ssl",
-  "py-cpp_multi_zlib-domain",
-  "py-cpp_multi_zlib-ip",
-  "py-cpp_multi_zlib-ip-ssl",
-  "py-cpp_multia-binary_buffered-domain",
-  "py-cpp_multia-binary_buffered-ip",
-  "py-cpp_multia-binary_buffered-ip-ssl",
-  "py-cpp_multia-binary_framed-domain",
-  "py-cpp_multia-binary_framed-ip",
-  "py-cpp_multia-binary_framed-ip-ssl",
   "py-cpp_multia-binary_http-domain",
   "py-cpp_multia-binary_http-ip",
   "py-cpp_multia-binary_http-ip-ssl",
   "py-cpp_multia-binary_zlib-domain",
   "py-cpp_multia-binary_zlib-ip",
   "py-cpp_multia-binary_zlib-ip-ssl",
-  "py-cpp_multia-multi_buffered-domain",
-  "py-cpp_multia-multi_buffered-ip",
-  "py-cpp_multia-multi_buffered-ip-ssl",
-  "py-cpp_multia-multi_framed-domain",
-  "py-cpp_multia-multi_framed-ip",
-  "py-cpp_multia-multi_framed-ip-ssl",
   "py-cpp_multia-multi_http-domain",
   "py-cpp_multia-multi_http-ip",
   "py-cpp_multia-multi_http-ip-ssl",
   "py-cpp_multia-multi_zlib-domain",
   "py-cpp_multia-multi_zlib-ip",
   "py-cpp_multia-multi_zlib-ip-ssl",
-  "py-cpp_multiac-compact_buffered-domain",
-  "py-cpp_multiac-compact_buffered-ip",
-  "py-cpp_multiac-compact_buffered-ip-ssl",
-  "py-cpp_multiac-compact_framed-domain",
-  "py-cpp_multiac-compact_framed-ip",
-  "py-cpp_multiac-compact_framed-ip-ssl",
   "py-cpp_multiac-compact_http-domain",
   "py-cpp_multiac-compact_http-ip",
   "py-cpp_multiac-compact_http-ip-ssl",
   "py-cpp_multiac-compact_zlib-domain",
   "py-cpp_multiac-compact_zlib-ip",
   "py-cpp_multiac-compact_zlib-ip-ssl",
-  "py-cpp_multiac-multic_buffered-domain",
-  "py-cpp_multiac-multic_buffered-ip",
-  "py-cpp_multiac-multic_buffered-ip-ssl",
-  "py-cpp_multiac-multic_framed-domain",
-  "py-cpp_multiac-multic_framed-ip",
-  "py-cpp_multiac-multic_framed-ip-ssl",
   "py-cpp_multiac-multic_http-domain",
   "py-cpp_multiac-multic_http-ip",
   "py-cpp_multiac-multic_http-ip-ssl",
   "py-cpp_multiac-multic_zlib-domain",
   "py-cpp_multiac-multic_zlib-ip",
   "py-cpp_multiac-multic_zlib-ip-ssl",
-  "py-cpp_multic-compact_buffered-domain",
-  "py-cpp_multic-compact_buffered-ip",
-  "py-cpp_multic-compact_buffered-ip-ssl",
-  "py-cpp_multic-compact_framed-domain",
-  "py-cpp_multic-compact_framed-ip",
-  "py-cpp_multic-compact_framed-ip-ssl",
   "py-cpp_multic-compact_http-domain",
   "py-cpp_multic-compact_http-ip",
   "py-cpp_multic-compact_http-ip-ssl",
-  "py-cpp_multic-compact_zlib-domain",
-  "py-cpp_multic-compact_zlib-ip",
-  "py-cpp_multic-compact_zlib-ip-ssl",
-  "py-cpp_multic_buffered-domain",
-  "py-cpp_multic_buffered-ip",
-  "py-cpp_multic_buffered-ip-ssl",
-  "py-cpp_multic_framed-domain",
-  "py-cpp_multic_framed-ip",
-  "py-cpp_multic_framed-ip-ssl",
   "py-cpp_multic_http-domain",
   "py-cpp_multic_http-ip",
   "py-cpp_multic_http-ip-ssl",
-  "py-cpp_multic_zlib-domain",
-  "py-cpp_multic_zlib-ip",
-  "py-cpp_multic_zlib-ip-ssl",
-  "py-cpp_multih-header_buffered-domain",
-  "py-cpp_multih-header_buffered-ip",
-  "py-cpp_multih-header_buffered-ip-ssl",
-  "py-cpp_multih-header_framed-domain",
-  "py-cpp_multih-header_framed-ip",
-  "py-cpp_multih-header_framed-ip-ssl",
   "py-cpp_multih-header_http-domain",
   "py-cpp_multih-header_http-ip",
   "py-cpp_multih-header_http-ip-ssl",
-  "py-cpp_multih-header_zlib-domain",
-  "py-cpp_multih-header_zlib-ip",
-  "py-cpp_multih-header_zlib-ip-ssl",
-  "py-cpp_multih_buffered-domain",
-  "py-cpp_multih_buffered-ip",
-  "py-cpp_multih_buffered-ip-ssl",
-  "py-cpp_multih_framed-domain",
-  "py-cpp_multih_framed-ip",
-  "py-cpp_multih_framed-ip-ssl",
   "py-cpp_multih_http-domain",
   "py-cpp_multih_http-ip",
   "py-cpp_multih_http-ip-ssl",
-  "py-cpp_multih_zlib-domain",
-  "py-cpp_multih_zlib-ip",
-  "py-cpp_multih_zlib-ip-ssl",
-  "py-cpp_multij-json_buffered-domain",
-  "py-cpp_multij-json_buffered-ip",
-  "py-cpp_multij-json_buffered-ip-ssl",
-  "py-cpp_multij-json_framed-domain",
-  "py-cpp_multij-json_framed-ip",
-  "py-cpp_multij-json_framed-ip-ssl",
   "py-cpp_multij-json_http-domain",
   "py-cpp_multij-json_http-ip",
   "py-cpp_multij-json_http-ip-ssl",
-  "py-cpp_multij-json_zlib-domain",
-  "py-cpp_multij-json_zlib-ip",
-  "py-cpp_multij-json_zlib-ip-ssl",
-  "py-cpp_multij_buffered-domain",
-  "py-cpp_multij_buffered-ip",
-  "py-cpp_multij_buffered-ip-ssl",
-  "py-cpp_multij_framed-domain",
-  "py-cpp_multij_framed-ip",
-  "py-cpp_multij_framed-ip-ssl",
   "py-cpp_multij_http-domain",
   "py-cpp_multij_http-ip",
   "py-cpp_multij_http-ip-ssl",
-  "py-cpp_multij_zlib-domain",
-  "py-cpp_multij_zlib-ip",
-  "py-cpp_multij_zlib-ip-ssl",
   "py-d_accel-binary_http-ip",
   "py-d_accel-binary_http-ip-ssl",
   "py-d_accelc-compact_http-ip",
@@ -1024,53 +801,23 @@
   "py-dart_binary_http-ip",
   "py-dart_compact_http-ip",
   "py-dart_json_http-ip",
-  "py-go_accel-binary_buffered-ip",
   "py-go_accel-binary_buffered-ip-ssl",
-  "py-go_accel-binary_framed-ip",
   "py-go_accel-binary_framed-ip-ssl",
-  "py-go_accel-binary_http-ip",
-  "py-go_accel-binary_http-ip-ssl",
-  "py-go_accel-binary_zlib-ip",
   "py-go_accel-binary_zlib-ip-ssl",
-  "py-go_accelc-compact_buffered-ip",
   "py-go_accelc-compact_buffered-ip-ssl",
-  "py-go_accelc-compact_framed-ip",
   "py-go_accelc-compact_framed-ip-ssl",
-  "py-go_accelc-compact_http-ip",
-  "py-go_accelc-compact_http-ip-ssl",
-  "py-go_accelc-compact_zlib-ip",
   "py-go_accelc-compact_zlib-ip-ssl",
-  "py-go_binary_buffered-ip",
   "py-go_binary_buffered-ip-ssl",
-  "py-go_binary_framed-ip",
   "py-go_binary_framed-ip-ssl",
-  "py-go_binary_http-ip",
-  "py-go_binary_http-ip-ssl",
-  "py-go_binary_zlib-ip",
   "py-go_binary_zlib-ip-ssl",
-  "py-go_compact_buffered-ip",
   "py-go_compact_buffered-ip-ssl",
-  "py-go_compact_framed-ip",
   "py-go_compact_framed-ip-ssl",
-  "py-go_compact_http-ip",
-  "py-go_compact_http-ip-ssl",
-  "py-go_compact_zlib-ip",
   "py-go_compact_zlib-ip-ssl",
-  "py-go_header_buffered-ip",
   "py-go_header_buffered-ip-ssl",
-  "py-go_header_framed-ip",
   "py-go_header_framed-ip-ssl",
-  "py-go_header_http-ip",
-  "py-go_header_http-ip-ssl",
-  "py-go_header_zlib-ip",
   "py-go_header_zlib-ip-ssl",
-  "py-go_json_buffered-ip",
   "py-go_json_buffered-ip-ssl",
-  "py-go_json_framed-ip",
   "py-go_json_framed-ip-ssl",
-  "py-go_json_http-ip",
-  "py-go_json_http-ip-ssl",
-  "py-go_json_zlib-ip",
   "py-go_json_zlib-ip-ssl",
   "py-hs_accel-binary_http-ip",
   "py-hs_accelc-compact_http-ip",
@@ -1301,12 +1048,12 @@
   "py-rb_compact_framed-domain",
   "py-rb_compact_framed-ip",
   "py-rb_compact_framed-ip-ssl",
-  "py-rb_header_buffered-ip-ssl",
-  "py-rb_header_framed-ip-ssl",
-  "py-rb_header_framed-ip",
   "py-rb_header_buffered-domain",
   "py-rb_header_buffered-ip",
+  "py-rb_header_buffered-ip-ssl",
   "py-rb_header_framed-domain",
+  "py-rb_header_framed-ip",
+  "py-rb_header_framed-ip-ssl",
   "py-rb_json_buffered-domain",
   "py-rb_json_buffered-ip",
   "py-rb_json_buffered-ip-ssl",
@@ -1383,8 +1130,8 @@
   "rb-netstd_json_buffered-ip-ssl",
   "rb-netstd_json_framed-ip",
   "rb-netstd_json_framed-ip-ssl",
-  "rb-py_header_framed-ip-ssl",
   "rb-py_header_buffered-ip-ssl",
+  "rb-py_header_framed-ip-ssl",
   "rs-netstd_binary_buffered-ip",
   "rs-netstd_binary_framed-ip",
   "rs-netstd_compact_buffered-ip",
@@ -1393,4 +1140,4 @@
   "rs-netstd_multi-binary_framed-ip",
   "rs-netstd_multic-compact_buffered-ip",
   "rs-netstd_multic-compact_framed-ip"
-]
+]
\ No newline at end of file
diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index 078ba02ddc..c471b92e2b 100644
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -77,56 +77,56 @@ TESTS= $(py_unit_tests)
 
 
 gen-py/%/__init__.py: ../%.thrift $(THRIFT)
-	test -f ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py  ../v0.16/$(notdir $<) \
+	test -f ../$(notdir $<) \
+	&& $(THRIFT) --gen py  ../$(notdir $<) \
 	|| $(THRIFT) --gen py  $<
 
 gen-py-default/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-default || $(MKDIR_P) gen-py-default
-	test -f ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py -out gen-py-default ../v0.16/$(notdir $<) \
+	test -f ../$(notdir $<) \
+	&& $(THRIFT) --gen py -out gen-py-default ../$(notdir $<) \
 	|| $(THRIFT) --gen py -out gen-py-default $<
 
 gen-py-slots/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-slots || $(MKDIR_P) gen-py-slots
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:slots -out gen-py-slots ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:slots -out gen-py-slots ../$(notdir $<) \
 	|| $(THRIFT) --gen py:slots -out gen-py-slots $<
 
 gen-py-oldstyle/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-oldstyle || $(MKDIR_P) gen-py-oldstyle
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:old_style -out gen-py-oldstyle ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:old_style -out gen-py-oldstyle ../$(notdir $<) \
 	|| $(THRIFT) --gen py:old_style -out gen-py-oldstyle $<
 
 gen-py-no_utf8strings/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-no_utf8strings || $(MKDIR_P) gen-py-no_utf8strings
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings ../$(notdir $<) \
 	|| $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings $<
 
 gen-py-dynamic/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-dynamic || $(MKDIR_P) gen-py-dynamic
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:dynamic -out gen-py-dynamic ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:dynamic -out gen-py-dynamic ../$(notdir $<) \
 	|| $(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
 
 gen-py-dynamicslots/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-dynamicslots || $(MKDIR_P) gen-py-dynamicslots
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots ../$(notdir $<) \
 	|| $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
 
 gen-py-enum/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-enum || $(MKDIR_P) gen-py-enum
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:enum -out gen-py-enum ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:enum -out gen-py-enum ../$(notdir $<) \
 	|| $(THRIFT) --gen py:enum -out gen-py-enum $<
 
 gen-py-type_hints/%/__init__.py: ../%.thrift $(THRIFT)
 	test -d gen-py-type_hints || $(MKDIR_P) gen-py-type_hints
-	test ../v0.16/$(notdir $<) \
-	&& $(THRIFT) --gen py:type_hints,enum -out gen-py-type_hints ../v0.16/$(notdir $<) \
+	test ../$(notdir $<) \
+	&& $(THRIFT) --gen py:type_hints,enum -out gen-py-type_hints ../$(notdir $<) \
 	|| $(THRIFT) --gen py:type_hints,enum -out gen-py-type_hints $<
 
 clean-local:
diff --git a/test/py/TestClient.py b/test/py/TestClient.py
index f608e4e35e..07b39a0dc9 100755
--- a/test/py/TestClient.py
+++ b/test/py/TestClient.py
@@ -24,6 +24,7 @@
 import sys
 import time
 import unittest
+import uuid
 
 from optparse import OptionParser
 from util import local_libpath
@@ -160,6 +161,13 @@ def testBinary(self):
         val = bytearray([i for i in range(0, 256)])
         self.assertEqual(bytearray(self.client.testBinary(bytes(val))), val)
 
+    def testUuid(self):
+        print('testUuid')
+        val1 = uuid.UUID('00112233-4455-6677-8899-aabbccddeeff')
+        val2 = uuid.uuid4()
+        self.assertEqual(self.client.testUuid(val1), val1)
+        self.assertEqual(self.client.testUuid(val2), val2)
+
     def testStruct(self):
         print('testStruct')
         x = Xtruct()
diff --git a/test/py/TestServer.py b/test/py/TestServer.py
index 0108c9882d..59a06ad2ad 100755
--- a/test/py/TestServer.py
+++ b/test/py/TestServer.py
@@ -82,6 +82,11 @@ def testBinary(self, thing):
             logging.info('testBinary()')  # TODO: hex output
         return thing
 
+    def testUuid(self, thing):
+        if self.options.verbose > 1:
+            logging.info('testUuid(%s)' % thing)
+        return thing
+
     def testStruct(self, thing):
         if self.options.verbose > 1:
             logging.info('testStruct({%s, %s, %s, %s})' % (thing.string_thing, thing.byte_thing, thing.i32_thing, thing.i64_thing))
diff --git a/test/py/TestTypes.py b/test/py/TestTypes.py
index bb1bc35e87..0df87aa6fd 100644
--- a/test/py/TestTypes.py
+++ b/test/py/TestTypes.py
@@ -20,6 +20,7 @@
 from ThriftTest import ThriftTest
 from ThriftTest.ThriftTest import Client
 from ThriftTest.ttypes import Xtruct
+from uuid import UUID
 
 import unittest
 
@@ -66,3 +67,6 @@ def test_list(self):
 
     def test_set(self):
         self.assertEqual(Client.testSet.__annotations__, {'return': set[int], 'thing': set[int]})
+
+    def test_uuid(self):
+        self.assertEqual(Client.testUuid.__annotations__, {'return': UUID, 'thing': UUID})
diff --git a/test/tests.json b/test/tests.json
index bcc87d3217..0f7dbe75e7 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -99,7 +99,7 @@
       ]
     },
     "client": {
-      "timeout": 6,
+      "timeout": 15,
       "command": [
         "testclient"
       ]
@@ -292,7 +292,7 @@
       ]
     },
     "client": {
-      "timeout": 10,
+      "timeout": 15,
       "command": [
         "TestClient.py",
         "--verbose",
@@ -342,7 +342,7 @@
       ]
     },
     "client": {
-      "timeout": 10,
+      "timeout": 15,
       "command": [
         "python3",
         "TestClient.py",
@@ -393,7 +393,7 @@
       ]
     },
     "client": {
-      "timeout": 8,
+      "timeout": 15,
       "command": [
         "TestClient"
       ],