diff --git a/compiler/AST/interfaces.cpp b/compiler/AST/interfaces.cpp
index d925c237c12e..9fe7a8f7872c 100644
--- a/compiler/AST/interfaces.cpp
+++ b/compiler/AST/interfaces.cpp
@@ -34,6 +34,10 @@
 
 InterfaceSymbol* gHashable = nullptr;
 InterfaceSymbol* gContextManager = nullptr;
+InterfaceSymbol* gWriteSerializable = nullptr;
+InterfaceSymbol* gReadDeserializable = nullptr;
+InterfaceSymbol* gInitDeserializable = nullptr;
+InterfaceSymbol* gSerializable = nullptr;
 
 static Symbol* isInterfaceFormalSymbol(Symbol* sym) {
   if (TypeSymbol* var = toTypeSymbol(sym))
@@ -74,6 +78,14 @@ DefExpr* InterfaceSymbol::buildDef(const char* name,
     gHashable = isym;
   } else if (gContextManager == nullptr && strcmp("contextManager", name) == 0) {
     gContextManager = isym;
+  } else if (gWriteSerializable == nullptr && strcmp("writeSerializable", name) == 0) {
+    gWriteSerializable = isym;
+  } else if (gReadDeserializable == nullptr && strcmp("readDeserializable", name) == 0) {
+    gReadDeserializable = isym;
+  } else if (gInitDeserializable == nullptr && strcmp("initDeserializable", name) == 0) {
+    gInitDeserializable = isym;
+  } else if (gSerializable == nullptr && strcmp("serializable", name) == 0) {
+    gSerializable = isym;
   }
 
   for_alist(formal, formals->argList) {
diff --git a/compiler/include/symbol.h b/compiler/include/symbol.h
index 92e50c536911..ef1d92205bf5 100644
--- a/compiler/include/symbol.h
+++ b/compiler/include/symbol.h
@@ -574,6 +574,10 @@ class InterfaceSymbol final : public Symbol {
 
 extern InterfaceSymbol* gHashable;
 extern InterfaceSymbol* gContextManager;
+extern InterfaceSymbol* gWriteSerializable;
+extern InterfaceSymbol* gReadDeserializable;
+extern InterfaceSymbol* gInitDeserializable;
+extern InterfaceSymbol* gSerializable;
 
 /************************************* | **************************************
 *                                                                             *
diff --git a/compiler/passes/buildDefaultFunctions.cpp b/compiler/passes/buildDefaultFunctions.cpp
index cdccafd16041..f8f75db21ace 100644
--- a/compiler/passes/buildDefaultFunctions.cpp
+++ b/compiler/passes/buildDefaultFunctions.cpp
@@ -1916,11 +1916,12 @@ static void buildDefaultReadWriteFunctions(AggregateType* ct) {
   }
 
   forv_Vec(FnSymbol, method, ct->methods) {
+    int n = method ? method->numFormals() : 0;
     if (method != nullptr &&
         method->isInitializer() &&
-        method->numFormals() == 4 &&
-        strcmp(method->getFormal(3)->name, "reader") == 0 &&
-        strcmp(method->getFormal(4)->name, "deserializer") == 0) {
+        n >= 4 &&
+        strcmp(method->getFormal(n-1)->name, "reader") == 0 &&
+        strcmp(method->getFormal(n)->name, "deserializer") == 0) {
       readerInit = method;
       break;
     }
diff --git a/compiler/passes/normalize.cpp b/compiler/passes/normalize.cpp
index c49de823e703..3bab034747b4 100644
--- a/compiler/passes/normalize.cpp
+++ b/compiler/passes/normalize.cpp
@@ -71,6 +71,8 @@ static void        replaceFunctionWithInstantiationsOfPrimitive(FnSymbol* fn);
 static void        fixupQueryFormals(FnSymbol* fn);
 static void        fixupCastFormals(FnSymbol* fn);
 
+static void        fixupExplicitGenericVariables(DefExpr* def);
+
 static void        updateInitMethod (FnSymbol* fn);
 
 static void        checkUseBeforeDefs();
@@ -2995,6 +2997,10 @@ void normalizeVariableDefinition(DefExpr* defExpr) {
   if (foundSplitInit == false && refVar)
     errorIfSplitInitializationRequired(defExpr, prevent);
 
+  if (type != nullptr) {
+    fixupExplicitGenericVariables(defExpr);
+  }
+
   if (requestedSplitInit && foundSplitInit == false) {
     // Create a dummy DEFAULT_INIT_VAR to sort out later in resolution
     // to support a pattern like
@@ -4843,6 +4849,44 @@ static void addToWhereClause(FnSymbol*  fn,
   combine->insertAtTail(test);
 }
 
+static void fixupExplicitGenericVariables(DefExpr* def) {
+  // this is a workaround for `(CallExpr _domain ?)` not being resolved
+  // fixup the pattern `(CallExpr _domain ?)` to be `(_domain(?))`,
+  // marking the `DefExpr` as generic
+  CHPL_ASSERT(def && def->exprType);
+
+  if (CallExpr* call = toCallExpr(def->exprType)) {
+    // if its a call like `_domain ?`, make it `_domain(?)` and MARKED_GENERIC
+    SymExpr* symExpr = nullptr;
+    bool actIsQuestion = false;
+    if (auto se = toSymExpr(call->baseExpr)) {
+
+      // only perform this transformation if the generic has no defaults
+      //   this is a workaround for something like `range`, which is generic with
+      //   defaults and which this normalization breaks
+      bool genericWithDefaults = false;
+      if (AggregateType* at = toAggregateType(se->symbol()->type)) {
+        genericWithDefaults = at->isGenericWithDefaults();
+      }
+      if (!genericWithDefaults) symExpr = se;
+    }
+    if (call->numActuals() == 1) {
+      if (auto se = toSymExpr(call->get(1))) {
+        actIsQuestion = se->symbol() == gUninstantiated;
+      }
+    }
+
+    if (symExpr && actIsQuestion) {
+      Symbol* symToSetGeneric = def->sym;
+      if (symToSetGeneric) {
+        symToSetGeneric->addFlag(FLAG_MARKED_GENERIC);
+        symExpr->remove();
+        call->replace(symExpr);
+      }
+    }
+  }
+}
+
 /************************************* | **************************************
 *                                                                             *
 *                                                                             *
diff --git a/compiler/resolution/functionResolution.cpp b/compiler/resolution/functionResolution.cpp
index b11a66512eda..ad7dca02062e 100644
--- a/compiler/resolution/functionResolution.cpp
+++ b/compiler/resolution/functionResolution.cpp
@@ -11263,11 +11263,36 @@ static AggregateType* getBaseTypeForInterfaceWarnings(Type* ts) {
   return toReturn;
 }
 
+static bool matchesSerializeShape(FnSymbol* fn,
+                                  const char* first, const char* second) {
+  // Initializer needs at least 4 : this, _mt, <generics>, reader, deserializer
+  int n = fn->numFormals();
+  if (fn->isInitializer()) {
+    if (n < 4) return false;
+  } else if (n != 4) {
+    // (de)serialize have only 4: this, _mt, <channel>, <(de)serializer>
+    return false;
+  }
+
+  bool ret = strcmp(fn->getFormal(n-1)->name, first) == 0 &&
+             strcmp(fn->getFormal(n)->name, second) == 0;
+  return ret;
+}
+
+static bool isSerdeSingleInterface(InterfaceSymbol* isym) {
+  return isym == gWriteSerializable ||
+         isym == gReadDeserializable ||
+         isym == gInitDeserializable;
+}
+
 static void checkSpeciallyNamedMethods() {
   static const std::unordered_map<const char*, InterfaceSymbol*> reservedNames = {
     { astr("hash"), gHashable },
     { astr("enterContext"), gContextManager },
-    { astr("exitContext"), gContextManager },
+    { astr("exitContext"),  gContextManager },
+    { astr("serialize"),    gWriteSerializable },
+    { astr("deserialize"),  gReadDeserializable },
+    { astr("init"),         gInitDeserializable },
   };
 
   SpecialMethodMap flagged;
@@ -11275,18 +11300,39 @@ static void checkSpeciallyNamedMethods() {
   for_alive_in_Vec(FnSymbol, fn, gFnSymbols) {
     if (!fn->isMethod()) continue;
     if (fn->isCompilerGenerated() || fn->hasFlag(FLAG_FIELD_ACCESSOR)) continue;
-    // The parent class must have this function, and would've been flagged.
-    // the user will already get the warning.
-    if (fn->hasFlag(FLAG_OVERRIDE)) continue;
     auto reservedIter = reservedNames.find(fn->name);
     if (reservedIter == reservedNames.end()) continue;
+    auto found = reservedIter->second;
+
+    if (found == gHashable || found == gContextManager) {
+      // The parent class must have this function, and would've been flagged.
+      // the user will already get the warning.
+      if (fn->hasFlag(FLAG_OVERRIDE)) continue;
+    }
 
     auto receiverType = fn->getReceiverType();
     auto at = getBaseTypeForInterfaceWarnings(receiverType);
-    if (!at || (reservedIter->second == gHashable && at == dtObject)) continue;
+    if (!at || (found == gHashable && at == dtObject)) continue;
 
-    auto key = SpeciallyNamedMethodKey(reservedIter->second, at);
+    // _iteratorRecord currently doesn't work with 'implements' statements at
+    // the moment (likely due to its typeclass-like nature), so we skip all
+    // iterator records manually here for the 'writeSerializable' case.
+    if (at->symbol->hasFlag(FLAG_ITERATOR_RECORD) &&
+        found == gWriteSerializable) continue;
+
+    if ((found == gInitDeserializable || found == gReadDeserializable) &&
+        !matchesSerializeShape(fn, "reader", "deserializer")) continue;
+
+    if (found == gWriteSerializable &&
+        !matchesSerializeShape(fn, "writer", "serializer")) continue;
+
+    auto key = SpeciallyNamedMethodKey(found, at);
     flagged[key].speciallyNamedMethods[fn->name] = fn;
+
+    if (isSerdeSingleInterface(found)) {
+      auto key = SpeciallyNamedMethodKey(gSerializable, at);
+      flagged[key].speciallyNamedMethods[fn->name] = fn;
+    }
   }
 
   for_alive_in_Vec(ImplementsStmt, istm, gImplementsStmts) {
@@ -11299,6 +11345,14 @@ static void checkSpeciallyNamedMethods() {
     // flagged set, because we found an instance.
     auto isym = istm->iConstraint->ifcSymbol();
     flagged.erase(SpeciallyNamedMethodKey(isym, at));
+
+    if (isym == gSerializable) {
+      flagged.erase(SpeciallyNamedMethodKey(gWriteSerializable, at));
+      flagged.erase(SpeciallyNamedMethodKey(gReadDeserializable, at));
+      flagged.erase(SpeciallyNamedMethodKey(gInitDeserializable, at));
+    } else if (isSerdeSingleInterface(isym)) {
+      flagged.erase(SpeciallyNamedMethodKey(gSerializable, at));
+    }
   }
 
   // the things now left in flagged, we did not find any implements statements
@@ -11307,6 +11361,11 @@ static void checkSpeciallyNamedMethods() {
     auto ifc = flaggedTypeIfc.first.first;
     auto at = flaggedTypeIfc.first.second;
 
+    // Don't recommend 'serializable' so that there are not duplicates
+    if (ifc == gSerializable) {
+      continue;
+    }
+
     USR_WARN(at,
              "the type '%s' defines methods that previously had special meaning. "
              "These will soon require '%s' to implement the '%s' interface to "
diff --git a/doc/rst/language/spec/iterators.rst b/doc/rst/language/spec/iterators.rst
index 3f79b90fd0b1..74bc1c7a6799 100644
--- a/doc/rst/language/spec/iterators.rst
+++ b/doc/rst/language/spec/iterators.rst
@@ -232,6 +232,7 @@ typically made by iterating over it in a loop.
 
    .. BLOCK-test-chapelnoprint
 
+      Tree implements writeSerializable;
       override proc Tree.serialize(writer, ref serializer)
       {
         var first = true;
diff --git a/modules/dists/BlockCycDist.chpl b/modules/dists/BlockCycDist.chpl
index 757e6e54f2bc..a98877184df1 100644
--- a/modules/dists/BlockCycDist.chpl
+++ b/modules/dists/BlockCycDist.chpl
@@ -182,7 +182,7 @@ executes each iteration on the locale where that iteration's index
 is mapped to.
 
 */
-class BlockCyclic : BaseDist {
+class BlockCyclic : BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
 
@@ -447,7 +447,7 @@ proc BlockCyclic.dsiPrivatize(privatizeData) {
 ////////////////////////////////////////////////////////////////////////////////
 // BlockCyclic Local Distribution Class
 //
-class LocBlockCyclic {
+class LocBlockCyclic : writeSerializable {
   param rank: int;
   type idxType;
 
@@ -747,7 +747,7 @@ proc BlockCyclicDom.dsiReprivatize(other, reprivatizeData) {
 ////////////////////////////////////////////////////////////////////////////////
 // BlockCyclic Local Domain Class
 //
-class LocBlockCyclicDom {
+class LocBlockCyclicDom : writeSerializable {
   param rank: int;
   type idxType;
   param strides: strideKind;
@@ -1111,7 +1111,7 @@ iter BlockCyclicDom.dsiLocalSubdomains(loc: locale) {
 ////////////////////////////////////////////////////////////////////////////////
 // BlockCyclic Local Array Class
 //
-class LocBlockCyclicArr {
+class LocBlockCyclicArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
diff --git a/modules/dists/BlockDist.chpl b/modules/dists/BlockDist.chpl
index 5063646a68ab..879642b2bf50 100644
--- a/modules/dists/BlockDist.chpl
+++ b/modules/dists/BlockDist.chpl
@@ -374,7 +374,7 @@ and array:
 */
 
 pragma "ignore noinit"
-record blockDist {
+record blockDist : writeSerializable {
   param rank: int;
   type idxType = int;
   type sparseLayoutType = unmanaged DefaultDist;
@@ -492,7 +492,7 @@ type Block = blockDist;
 
 
 @chpldoc.nodoc
-class BlockImpl : BaseDist {
+class BlockImpl : BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
   var boundingBox: domain(rank, idxType);
@@ -582,7 +582,7 @@ class BlockArr: BaseRectangularArr(?) {
 // locDom: reference to local domain class
 // myElems: a non-distributed array of local elements
 //
-class LocBlockArr {
+class LocBlockArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
@@ -2147,7 +2147,7 @@ config param debugBlockScan = false;
  * suitable for general use since there are races with when the value gets
  * written to, but safe for single writer, single reader case here.
  */
-class BoxedSync {
+class BoxedSync : writeSerializable {
   type T;
   var s: sync int; // int over bool to enable native qthread sync
   var res: T;
diff --git a/modules/dists/CyclicDist.chpl b/modules/dists/CyclicDist.chpl
index f997d571ef08..8aeaa87ee732 100644
--- a/modules/dists/CyclicDist.chpl
+++ b/modules/dists/CyclicDist.chpl
@@ -233,7 +233,7 @@ This distribution has not been tuned for performance.
 */
 
 pragma "ignore noinit"
-record cyclicDist {
+record cyclicDist : writeSerializable {
   param rank: int;
   type idxType = int;
 
@@ -351,7 +351,7 @@ operator =(ref a: cyclicDist(?), b: cyclicDist(?)) {
 type Cyclic = cyclicDist;
 
 @chpldoc.nodoc
-class CyclicImpl: BaseDist {
+class CyclicImpl: BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
 
@@ -1231,7 +1231,7 @@ proc CyclicArr.setRADOpt(val=true) {
   if doRADOpt then setupRADOpt();
 }
 
-class LocCyclicArr {
+class LocCyclicArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
diff --git a/modules/dists/DSIUtil.chpl b/modules/dists/DSIUtil.chpl
index 5f24fcd67f17..2f29830c0972 100644
--- a/modules/dists/DSIUtil.chpl
+++ b/modules/dists/DSIUtil.chpl
@@ -683,7 +683,7 @@ proc bulkCommConvertCoordinate(ind, bView:domain, aView:domain)
   return result;
 }
 
-record chpl_PrivatizedDistHelper {
+record chpl_PrivatizedDistHelper : writeSerializable {
 //  type instanceType;
   var _pid:int;  // only used when privatized
   pragma "owned"
diff --git a/modules/dists/DimensionalDist2D.chpl b/modules/dists/DimensionalDist2D.chpl
index b92bf7e8ab3b..de1ce6a54d30 100644
--- a/modules/dists/DimensionalDist2D.chpl
+++ b/modules/dists/DimensionalDist2D.chpl
@@ -374,7 +374,7 @@ class DimensionalArr : BaseRectangularArr(?) {
                       unmanaged LocDimensionalArr(eltType, allocDom.locDdescType);
 }
 
-class LocDimensionalArr {
+class LocDimensionalArr : writeSerializable {
   type eltType;
   const locDom;  // a LocDimensionalDom
   pragma "local field" pragma "unsafe"
diff --git a/modules/dists/HashedDist.chpl b/modules/dists/HashedDist.chpl
index cec98317d0ad..27367d2091f3 100644
--- a/modules/dists/HashedDist.chpl
+++ b/modules/dists/HashedDist.chpl
@@ -115,7 +115,7 @@ The `Hashed` domain map initializer is defined as follows:
             targetLocales: [] locale = Locales)
 
  */
-class Hashed : BaseDist {
+class Hashed : BaseDist, writeSerializable {
 
   // GENERICS:
 
@@ -572,7 +572,7 @@ class UserMapAssocDom: BaseAssociativeDom {
 //
 // the local domain class
 //
-class LocUserMapAssocDom {
+class LocUserMapAssocDom : writeSerializable {
 
   // GENERICS:
 
@@ -964,7 +964,7 @@ class UserMapAssocArr: AbsBaseArr(?) {
 //
 // the local array class
 //
-class LocUserMapAssocArr {
+class LocUserMapAssocArr : writeSerializable {
 
   // GENERICS:
 
diff --git a/modules/dists/PrivateDist.chpl b/modules/dists/PrivateDist.chpl
index 57bc614359db..0a9a7b5981f5 100644
--- a/modules/dists/PrivateDist.chpl
+++ b/modules/dists/PrivateDist.chpl
@@ -74,7 +74,7 @@ This distribution may perform unnecessary communication
 between locales.
 */
 
-record privateDist {
+record privateDist: writeSerializable {
   forwarding const chpl_distHelp: chpl_PrivatizedDistHelper(unmanaged PrivateImpl);
 
   proc init() {
@@ -155,7 +155,7 @@ type Private = privateDist;
 
 
 @chpldoc.nodoc
-class PrivateImpl: BaseDist {
+class PrivateImpl: BaseDist, writeSerializable {
   override proc dsiNewRectangularDom(param rank: int, type idxType,
                                      param strides: strideKind, inds) {
     for i in inds do
diff --git a/modules/dists/ReplicatedDist.chpl b/modules/dists/ReplicatedDist.chpl
index 5925d6e3523d..e6ef2087e7bf 100644
--- a/modules/dists/ReplicatedDist.chpl
+++ b/modules/dists/ReplicatedDist.chpl
@@ -116,7 +116,7 @@ when the initializer encounters an error.
 
 
 pragma "ignore noinit"
-record replicatedDist {
+record replicatedDist : writeSerializable {
   forwarding const chpl_distHelp: chpl_PrivatizedDistHelper(unmanaged ReplicatedImpl);
 
   proc init(targetLocales: [] locale = Locales,
@@ -514,7 +514,7 @@ proc _array.replicand(loc: locale) ref {
 //
 // local array class
 //
-class LocReplicatedArr {
+class LocReplicatedArr : writeSerializable {
   // these generic fields let us give types to the other fields easily
   type eltType;
   param rank: int;
diff --git a/modules/dists/SparseBlockDist.chpl b/modules/dists/SparseBlockDist.chpl
index d989318a6fda..dedb2334feb5 100644
--- a/modules/dists/SparseBlockDist.chpl
+++ b/modules/dists/SparseBlockDist.chpl
@@ -551,7 +551,7 @@ class SparseBlockArr: BaseSparseArr(?) {
 // locDom: reference to local domain class
 // myElems: a non-distributed array of local elements
 //
-class LocSparseBlockArr {
+class LocSparseBlockArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
diff --git a/modules/dists/StencilDist.chpl b/modules/dists/StencilDist.chpl
index 3d348fdcd0d8..12670c963a21 100644
--- a/modules/dists/StencilDist.chpl
+++ b/modules/dists/StencilDist.chpl
@@ -328,7 +328,7 @@ config param disableStencilLazyRAD = defaultDisableLazyRADOpt;
 
 */
 pragma "ignore noinit"
-record stencilDist {
+record stencilDist : writeSerializable {
   param rank: int;
   type idxType = int;
   param ignoreFluff = false;
@@ -436,7 +436,7 @@ operator =(ref a: stencilDist(?), b: stencilDist(?)) {
 type Stencil = stencilDist;
 
 
-class StencilImpl : BaseDist {
+class StencilImpl : BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
   param ignoreFluff: bool;
@@ -540,7 +540,7 @@ class StencilArr: BaseRectangularArr(?) {
 // locDom: reference to local domain class
 // myElems: a non-distributed array of local elements
 //
-class LocStencilArr {
+class LocStencilArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
diff --git a/modules/dists/fixDistDocs.perl b/modules/dists/fixDistDocs.perl
index 02a7c9c68beb..903ca3b0138f 100755
--- a/modules/dists/fixDistDocs.perl
+++ b/modules/dists/fixDistDocs.perl
@@ -75,8 +75,19 @@ sub process {
    }
 
    # Skip everything until "class::" or "record::", edit that line and print.
+   # do skip '.. warning'
    while (<RST>) {
-      if (/^.. (class|record)::/) {
+      # if the next line is a warning (like an unstable warning), keep it
+      #  note this only handles single line warnings
+      if (/^.. warning::$/) {
+          print MOD;
+          # print the three lines after ''.. warning'
+          for (1..3) {
+              my $warningNextLine = <RST>;
+              print MOD $warningNextLine;
+          }
+      }
+      elsif (/^.. (class|record)::/) {
          s/ : Base.*//;
          print MOD;
          last;
diff --git a/modules/internal/Atomics.chpl b/modules/internal/Atomics.chpl
index 2ea394f0492a..799b9174bdc1 100644
--- a/modules/internal/Atomics.chpl
+++ b/modules/internal/Atomics.chpl
@@ -230,7 +230,7 @@ module Atomics {
 
   pragma "atomic type"
   pragma "ignore noinit"
-  record AtomicBool {
+  record AtomicBool : writeSerializable {
     // Support `valType` on atomic bool type and instances for symmetry with
     // numeric atomics
     @chpldoc.nodoc
@@ -431,7 +431,7 @@ module Atomics {
 
   pragma "atomic type"
   pragma "ignore noinit"
-  record AtomicT {
+  record AtomicT : writeSerializable {
     @chpldoc.nodoc
     type valType;
 
diff --git a/modules/internal/Bytes.chpl b/modules/internal/Bytes.chpl
index d09fda88675d..a49f1491931e 100644
--- a/modules/internal/Bytes.chpl
+++ b/modules/internal/Bytes.chpl
@@ -413,7 +413,7 @@ module Bytes {
   }
 
   @chpldoc.nodoc
-  record _bytes {
+  record _bytes : writeSerializable, readDeserializable {
     var buffLen: int = 0; // length of string in bytes
     var buffSize: int = 0; // size of the buffer we own
     var buff: bufferType = nil;
diff --git a/modules/internal/ChapelArray.chpl b/modules/internal/ChapelArray.chpl
index 50fdbe0b954b..b34496bb49dc 100644
--- a/modules/internal/ChapelArray.chpl
+++ b/modules/internal/ChapelArray.chpl
@@ -714,7 +714,7 @@ module ChapelArray {
   pragma "distribution"
   pragma "ignore noinit"
   @chpldoc.nodoc
-  record _distribution {
+  record _distribution : writeSerializable, readDeserializable {
     var _pid:int;  // only used when privatized
     pragma "owned"
     var _instance; // generic, but an instance of a subclass of BaseDist
@@ -958,7 +958,7 @@ module ChapelArray {
   // the serialize routines to fire, when their where-clause permits.
   pragma "always RVF"
   /* The array type */
-  record _array {
+  record _array : writeSerializable, readDeserializable {
     var _pid:int;  // only used when privatized
     pragma "owned"
     pragma "alias scope from this"
diff --git a/modules/internal/ChapelBase.chpl b/modules/internal/ChapelBase.chpl
index fbf96fef773c..4da4182de960 100644
--- a/modules/internal/ChapelBase.chpl
+++ b/modules/internal/ChapelBase.chpl
@@ -3307,7 +3307,7 @@ module ChapelBase {
   extern const QIO_TUPLE_FORMAT_JSON:int;
 
   // Support for module deinit functions.
-  class chpl_ModuleDeinit {
+  class chpl_ModuleDeinit : writeSerializable {
     const moduleName: c_ptrConst(c_char); // for debugging; non-null, not owned
     const deinitFun:  chpl_c_fn_ptr;          // module deinit function
     const prevModule: unmanaged chpl_ModuleDeinit?; // singly-linked list / LIFO queue
diff --git a/modules/internal/ChapelDomain.chpl b/modules/internal/ChapelDomain.chpl
index ff4c026c9426..090132c90181 100644
--- a/modules/internal/ChapelDomain.chpl
+++ b/modules/internal/ChapelDomain.chpl
@@ -1009,7 +1009,7 @@ module ChapelDomain {
   pragma "domain"
   pragma "has runtime type"
   pragma "ignore noinit"
-  record _domain {
+  record _domain : writeSerializable, readDeserializable {
     var _pid:int; // only used when privatized
     pragma "owned"
     var _instance; // generic, but an instance of a subclass of BaseDom
diff --git a/modules/packages/OrderedMap.chpl b/modules/internal/ChapelIOSerialize.chpl
similarity index 64%
rename from modules/packages/OrderedMap.chpl
rename to modules/internal/ChapelIOSerialize.chpl
index 29831a6916b8..0cb32d560c7f 100644
--- a/modules/packages/OrderedMap.chpl
+++ b/modules/internal/ChapelIOSerialize.chpl
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020-2023 Hewlett Packard Enterprise Development LP
+ * Copyright 2004-2019 Cray Inc.
  * Other additional copyright holders may be indicated within.
  *
  * The entirety of this work is licensed under the Apache License,
@@ -17,9 +18,27 @@
  * limitations under the License.
  */
 
-@deprecated(notes="The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap")
-module OrderedMap {
-  public use SortedMap;
+// ChapelIOSerialize.chpl
+//
+// IO serialization-related interfaces
+module ChapelIOSerialize {
+
+  use ChapelBase;
+
+  // for 'serialize'
+  interface writeSerializable {
+  }
+
+  // for 'deserialize'
+  interface readDeserializable {
+  }
+
+  // for 'init' that performs deserialization
+  interface initDeserializable {
+  }
+
+  // combines previous three
+  interface serializable {
+  }
 
-  type orderedMap = sortedMap;
 }
diff --git a/modules/internal/ChapelIteratorSupport.chpl b/modules/internal/ChapelIteratorSupport.chpl
index f687acb51d1a..9a5a705d3c04 100644
--- a/modules/internal/ChapelIteratorSupport.chpl
+++ b/modules/internal/ChapelIteratorSupport.chpl
@@ -353,22 +353,6 @@ module ChapelIteratorSupport {
     return false;
   }
 
-  proc _iteratorRecord.writeThis(f) throws {
-    var first: bool = true;
-    for e in this {
-      if !first then
-        f.write(" ");
-      else
-        first = false;
-      f.write(e);
-    }
-  }
-
-  @chpldoc.nodoc
-  proc _iteratorRecord.serialize(writer, ref serializer) throws {
-    writeThis(writer);
-  }
-
   operator =(ref ic: _iteratorRecord, xs) {
     for (e, x) in zip(ic, xs) do
       e = x;
diff --git a/modules/internal/ChapelLocale.chpl b/modules/internal/ChapelLocale.chpl
index c5263c28a2ba..1085fb3f7927 100644
--- a/modules/internal/ChapelLocale.chpl
+++ b/modules/internal/ChapelLocale.chpl
@@ -290,7 +290,7 @@ module ChapelLocale {
     by the corresponding concrete classes.
    */
   @chpldoc.nodoc
-  class BaseLocale {
+  class BaseLocale : writeSerializable {
     //- Constructor
     @chpldoc.nodoc
     proc init() { }
diff --git a/modules/internal/ChapelStandard.chpl b/modules/internal/ChapelStandard.chpl
index bac9dc5c1b71..cc7958c1fd77 100644
--- a/modules/internal/ChapelStandard.chpl
+++ b/modules/internal/ChapelStandard.chpl
@@ -58,6 +58,7 @@ module ChapelStandard {
   public use ChapelArray;
   public use ChapelDistribution;
   public use ChapelAutoLocalAccess;
+  public use ChapelIOSerialize;
   public use ChapelIO as ChapelIO;
   public use ChapelHashing;
   public use DefaultAssociative;
diff --git a/modules/internal/ChapelSyncvar.chpl b/modules/internal/ChapelSyncvar.chpl
index b84086dd970a..905d14bba524 100644
--- a/modules/internal/ChapelSyncvar.chpl
+++ b/modules/internal/ChapelSyncvar.chpl
@@ -121,7 +121,7 @@ module ChapelSyncvar {
   pragma "sync"
   pragma "default intent is ref"
   @chpldoc.nodoc
-  record _syncvar {
+  record _syncvar : writeSerializable, readDeserializable {
     type valType;                              // The compiler knows this name
 
     var  wrapped : getSyncClassType(valType);
@@ -812,7 +812,7 @@ module ChapelSyncvar {
   pragma "single"
   pragma "default intent is ref"
   @chpldoc.nodoc
-  record _singlevar {
+  record _singlevar : writeSerializable, readDeserializable {
     type valType;                              // The compiler knows this name
 
     var  wrapped : unmanaged _singlecls(valType);
diff --git a/modules/internal/DefaultRectangular.chpl b/modules/internal/DefaultRectangular.chpl
index e2e7519a8318..075ee9c3c6a4 100644
--- a/modules/internal/DefaultRectangular.chpl
+++ b/modules/internal/DefaultRectangular.chpl
@@ -1717,6 +1717,26 @@ module DefaultRectangular {
     rwLiteral("}");
   }
 
+  proc DefaultRectangularDom.dsiSerialWrite(f) throws
+  where _supportsSerializers(f) && f.serializerType != IO.defaultSerializer {
+    if chpl_warnUnstable then
+      compilerWarning("Serialization of rectangular domains with non-default Serializer is unstable, and may change in the future");
+    var ser = f.serializer.startList(f, rank);
+    for i in 0..<rank do ser.writeElement(dsiDim(i));
+    ser.endList();
+  }
+
+  // TODO: There is currently a bug when returning domains from
+  // 'deserializeFrom', so this isn't tested yet.
+  proc DefaultRectangularDom.dsiSerialRead(f) throws
+  where _supportsSerializers(f) && f.deserializerType != IO.defaultDeserializer {
+    if chpl_warnUnstable then
+      compilerWarning("Deserialization of rectangular domains with non-default Deserializer is unstable, and may change in the future");
+    var des = f.deserializer.startList(f);
+    for i in 0..<rank do ranges(i) = des.readElement(ranges(i).type);
+    des.endList();
+  }
+
   proc DefaultRectangularDom.doiToString() {
     var str = "{" + ranges(0):string;
     for i in 1..<rank do
diff --git a/modules/internal/NetworkAtomics.chpl b/modules/internal/NetworkAtomics.chpl
index 04d2d9007be6..a998830e440b 100644
--- a/modules/internal/NetworkAtomics.chpl
+++ b/modules/internal/NetworkAtomics.chpl
@@ -32,7 +32,7 @@ module NetworkAtomics {
 
   pragma "atomic type"
   pragma "ignore noinit"
-  record RAtomicBool {
+  record RAtomicBool : writeSerializable {
     proc type valType type { return bool; }
     proc valType type { return bool; }
 
@@ -149,7 +149,7 @@ module NetworkAtomics {
 
   pragma "atomic type"
   pragma "ignore noinit"
-  record RAtomicT {
+  record RAtomicT : writeSerializable {
     type valType;
     var _v: valType;
 
diff --git a/modules/internal/OwnedObject.chpl b/modules/internal/OwnedObject.chpl
index f4894e2e5e37..8d13518772cd 100644
--- a/modules/internal/OwnedObject.chpl
+++ b/modules/internal/OwnedObject.chpl
@@ -37,7 +37,7 @@ module OwnedObject {
   pragma "no copy"
   pragma "copy mutates"
   pragma "managed pointer"
-  record _owned {
+  record _owned : writeSerializable, readDeserializable {
     type chpl_t;                // contained type (class type)
 
     // contained pointer (class type)
diff --git a/modules/internal/SharedObject.chpl b/modules/internal/SharedObject.chpl
index 70a453e63bf0..bd9aa6f1c8f3 100644
--- a/modules/internal/SharedObject.chpl
+++ b/modules/internal/SharedObject.chpl
@@ -116,7 +116,7 @@ module SharedObject {
     This is currently implemented with task-safe reference counting.
   */
   pragma "managed pointer"
-  record _shared {
+  record _shared : writeSerializable, readDeserializable {
     type chpl_t;         // contained type (class type)
 
     // contained pointer (class type)
@@ -754,7 +754,7 @@ Weak pointers are implemented using task-safe reference counting.
 module WeakPointer {
   use Errors, Atomics, ChapelBase;
 
-  record weak {
+  record weak : writeSerializable {
     /* The shared class type referenced by this pointer */
     type classType;
 
diff --git a/modules/internal/String.chpl b/modules/internal/String.chpl
index db62e46d1d26..e15ebed4a91e 100644
--- a/modules/internal/String.chpl
+++ b/modules/internal/String.chpl
@@ -76,7 +76,7 @@ module String {
 
   pragma "plain old data"
   @chpldoc.nodoc
-  record byteIndex {
+  record byteIndex : writeSerializable {
     @chpldoc.nodoc
     var _bindex  : int;
 
@@ -101,7 +101,7 @@ module String {
 
   pragma "plain old data"
   @chpldoc.nodoc
-  record codepointIndex {
+  record codepointIndex : writeSerializable {
     @chpldoc.nodoc
     var _cpindex  : int;
 
@@ -927,7 +927,7 @@ module String {
   pragma "ignore noinit"
   pragma "no default functions" // avoid the default (read|write)This routines
   @chpldoc.nodoc
-  record _string {
+  record _string : writeSerializable {
     var buffLen: int = 0; // length of string in bytes
     var buffSize: int = 0; // size of the buffer we own
     var cachedNumCodepoints: int = 0;
diff --git a/modules/internal/localeModels/apu/LocaleModel.chpl b/modules/internal/localeModels/apu/LocaleModel.chpl
index e4f1ba7fd480..8220226eb20a 100644
--- a/modules/internal/localeModels/apu/LocaleModel.chpl
+++ b/modules/internal/localeModels/apu/LocaleModel.chpl
@@ -51,7 +51,7 @@ module LocaleModel {
     return execution_subloc;  // no info needed from full sublocale
   }
 
-  class CPULocale : AbstractLocaleModel {
+  class CPULocale : AbstractLocaleModel, writeSerializable {
     const sid: chpl_sublocID_t;
     const name_: string;
 
diff --git a/modules/internal/localeModels/flat/LocaleModel.chpl b/modules/internal/localeModels/flat/LocaleModel.chpl
index 929d8510152d..6bb3c68f25b1 100644
--- a/modules/internal/localeModels/flat/LocaleModel.chpl
+++ b/modules/internal/localeModels/flat/LocaleModel.chpl
@@ -138,7 +138,7 @@ module LocaleModel {
   // may overwrite this instance or any of its children to establish a more customized
   // representation of the system resources.
   //
-  class RootLocale : AbstractRootLocale {
+  class RootLocale : AbstractRootLocale, writeSerializable {
 
     const myLocaleSpace: domain(1) = {0..numLocales-1};
     pragma "unsafe"
diff --git a/modules/internal/localeModels/gpu/LocaleModel.chpl b/modules/internal/localeModels/gpu/LocaleModel.chpl
index a5cbc142fedb..284a8e85d33c 100644
--- a/modules/internal/localeModels/gpu/LocaleModel.chpl
+++ b/modules/internal/localeModels/gpu/LocaleModel.chpl
@@ -211,7 +211,7 @@ module LocaleModel {
     return execution_subloc;  // no info needed from full sublocale
   }
 
-  class GPULocale : AbstractLocaleModel {
+  class GPULocale : AbstractLocaleModel, writeSerializable {
     const sid: chpl_sublocID_t;
 
     override proc chpl_id() do return try! (parent._value:LocaleModel)._node_id; // top-level node id
@@ -376,7 +376,7 @@ module LocaleModel {
   // may overwrite this instance or any of its children to establish a more customized
   // representation of the system resources.
   //
-  class RootLocale : AbstractRootLocale {
+  class RootLocale : AbstractRootLocale, writeSerializable {
 
     const myLocaleSpace: domain(1) = {0..numLocales-1};
     pragma "unsafe"
diff --git a/modules/internal/localeModels/numa/LocaleModel.chpl b/modules/internal/localeModels/numa/LocaleModel.chpl
index ba14393c2827..8b4dd3c98e24 100644
--- a/modules/internal/localeModels/numa/LocaleModel.chpl
+++ b/modules/internal/localeModels/numa/LocaleModel.chpl
@@ -56,7 +56,7 @@ module LocaleModel {
   //
   // The NUMA sublocale model
   //
-  class NumaDomain : AbstractLocaleModel {
+  class NumaDomain : AbstractLocaleModel, writeSerializable {
     const sid: chpl_sublocID_t;
     const ndName: string; // note: locale provides `proc name`
 
@@ -225,7 +225,7 @@ module LocaleModel {
   // may overwrite this instance or any of its children to establish a more customized
   // representation of the system resources.
   //
-  class RootLocale : AbstractRootLocale {
+  class RootLocale : AbstractRootLocale, writeSerializable {
 
     const myLocaleSpace: domain(1) = {0..numLocales-1};
     pragma "unsafe"
diff --git a/modules/packages/AtomicObjects.chpl b/modules/packages/AtomicObjects.chpl
index 93d6415e5f21..03831d09b1c1 100644
--- a/modules/packages/AtomicObjects.chpl
+++ b/modules/packages/AtomicObjects.chpl
@@ -351,7 +351,7 @@ prototype module AtomicObjects {
      should be created by LocalAtomicObject. The object protected by this ABA wrapper can
      be extracted via 'getObject'.
   */
-  record ABA {
+  record ABA : serializable {
     type __ABA_objType;
     @chpldoc.nodoc
     var __ABA_ptr : uint(64);
@@ -464,7 +464,7 @@ prototype module AtomicObjects {
     return aba1.__ABA_cnt != aba2.__ABA_cnt || aba1.__ABA_ptr != aba2.__ABA_ptr;
   }
 
-  record AtomicObject {
+  record AtomicObject : serializable {
     type objType;
     // If this atomic instance provides ABA support
     param hasABASupport : bool;
diff --git a/modules/packages/DistributedBag.chpl b/modules/packages/DistributedBag.chpl
index 2481dcffddca..31767bde0f50 100644
--- a/modules/packages/DistributedBag.chpl
+++ b/modules/packages/DistributedBag.chpl
@@ -223,7 +223,7 @@ module DistributedBag {
     the data structure for maximized performance.
   */
   pragma "always RVF"
-  record DistBag {
+  record DistBag : serializable {
     type eltType;
 
     // This is unused, and merely for documentation purposes. See '_value'.
diff --git a/modules/packages/EpochManager.chpl b/modules/packages/EpochManager.chpl
index 654efc3a88c5..7a307281685d 100644
--- a/modules/packages/EpochManager.chpl
+++ b/modules/packages/EpochManager.chpl
@@ -421,7 +421,7 @@ module EpochManager {
 
     config param VectorGrowthRate : real = 1.5;
 
-    class Vector {
+    class Vector : serializable {
       type eltType;
       const growthRate : real;
       var dom = {0..-1};
diff --git a/modules/packages/LinkedLists.chpl b/modules/packages/LinkedLists.chpl
index 516c3ffc1fb9..f51cf75fdd0e 100644
--- a/modules/packages/LinkedLists.chpl
+++ b/modules/packages/LinkedLists.chpl
@@ -70,7 +70,7 @@ class listNode {
       :proc:`~LinkedList.destroy` must be called to reclaim any memory used by the list.
 
  */
-record LinkedList {
+record LinkedList : serializable {
   /*
     The type of the data stored in every node.
    */
diff --git a/modules/packages/OrderedSet.chpl b/modules/packages/OrderedSet.chpl
deleted file mode 100644
index 47648b627498..000000000000
--- a/modules/packages/OrderedSet.chpl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2020-2023 Hewlett Packard Enterprise Development LP
- * Other additional copyright holders may be indicated within.
- *
- * The entirety of this work is licensed under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- *
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@deprecated(notes="The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap")
-module OrderedSet {
-  public use SortedSet;
-
-  type orderedSet = sortedSet;
-}
diff --git a/modules/packages/Socket.chpl b/modules/packages/Socket.chpl
index c07d2e4388e1..40ad6033ead8 100644
--- a/modules/packages/Socket.chpl
+++ b/modules/packages/Socket.chpl
@@ -116,7 +116,7 @@ proc sys_sockaddr_t.init(in other: sys_sockaddr_t) {
   IPv4 and IPv6 addresses. ipAddr can be compared using
   `==` and `!=` operators.
 */
-record ipAddr {
+record ipAddr : writeSerializable {
   @chpldoc.nodoc
   var _addressStorage:sys_sockaddr_t;
 
@@ -614,7 +614,7 @@ var event_loop_base:c_ptr(event_base);
   A record holding reference to a tcp socket
   bound and listening for connections.
 */
-record tcpListener {
+record tcpListener : writeSerializable {
   /*
     File Descriptor Associated with instance
   */
@@ -998,7 +998,7 @@ proc connect(in host: string, in port: uint(16), family: IPFamily = IPFamily.IPU
   A record holding reference to a udp socket
   bound to any available port.
 */
-record udpSocket {
+record udpSocket : writeSerializable {
   /*
     File Descriptor Associated with instance
   */
diff --git a/modules/packages/Sort.chpl b/modules/packages/Sort.chpl
index 8b4f6ff07deb..0833043e6ec1 100644
--- a/modules/packages/Sort.chpl
+++ b/modules/packages/Sort.chpl
@@ -1446,7 +1446,7 @@ module SampleSortHelp {
 
 
 
-  record SampleBucketizer {
+  record SampleBucketizer : writeSerializable {
     type eltType;
 
     // filled from 1 to num_buckets_
@@ -2214,7 +2214,7 @@ module TwoArrayPartitioning {
     }
   }
 
-  record TwoArrayDistSortTask {
+  record TwoArrayDistSortTask : writeSerializable {
     var tasks: list(TwoArrayDistSortPerBucketTask);
 
     // Create an empty one
diff --git a/modules/packages/SortedMap.chpl b/modules/packages/SortedMap.chpl
index 19977cfef739..af673bbced34 100644
--- a/modules/packages/SortedMap.chpl
+++ b/modules/packages/SortedMap.chpl
@@ -86,7 +86,7 @@ module SortedMap {
     var val;
   }
 
-  record sortedMap {
+  record sortedMap : writeSerializable {
     /* Type of sortedMap keys. */
     type keyType;
     /* Type of sortedMap values. */
diff --git a/modules/packages/SortedSet.chpl b/modules/packages/SortedSet.chpl
index c962d9ecd7dc..cd63d73655df 100644
--- a/modules/packages/SortedSet.chpl
+++ b/modules/packages/SortedSet.chpl
@@ -43,7 +43,7 @@ module SortedSet {
   private use IO;
   public use Sort only defaultComparator;
 
-  record sortedSet {
+  record sortedSet : writeSerializable {
     /* The type of the elements contained in this sortedSet. */
     type eltType;
 
diff --git a/modules/packages/SortedSet/Treap.chpl b/modules/packages/SortedSet/Treap.chpl
index d13a00e8dafd..135e009c52f8 100644
--- a/modules/packages/SortedSet/Treap.chpl
+++ b/modules/packages/SortedSet/Treap.chpl
@@ -129,7 +129,7 @@ module Treap {
     }
   }
 
-  record treap {
+  record treap : writeSerializable {
     /* The type of the elements contained in this sortedSet.*/
     type eltType;
 
diff --git a/modules/packages/TOML.chpl b/modules/packages/TOML.chpl
index af1bef55b01e..c23ac6fe005e 100644
--- a/modules/packages/TOML.chpl
+++ b/modules/packages/TOML.chpl
@@ -578,7 +578,7 @@ module TomlParser {
 Class to hold various types parsed from input
 used to recursively hold tables and respective values
 */
-  class Toml {
+  class Toml : writeSerializable {
 
     @chpldoc.nodoc
     var i: int,
@@ -1319,7 +1319,7 @@ module TomlReader {
 
 
   /* Array wrapper */
-  class Tokens {
+  class Tokens : serializable {
     var A: list(string);
 
     proc init(A: list(string)) {
diff --git a/modules/packages/UnrolledLinkedList.chpl b/modules/packages/UnrolledLinkedList.chpl
index 26f4920c4e9c..877948a78cc1 100644
--- a/modules/packages/UnrolledLinkedList.chpl
+++ b/modules/packages/UnrolledLinkedList.chpl
@@ -110,7 +110,7 @@ module UnrolledLinkedList {
     }
   };
 
-  record unrolledLinkedList {
+  record unrolledLinkedList : writeSerializable {
 
     /* The type of the elements contained in this unrolledLinkedList. */
     type eltType;
@@ -610,26 +610,6 @@ module UnrolledLinkedList {
       return result;
     }
 
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: list(eltType, ?p)) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: unrolledLinkedList(eltType, ?p)) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: [?d] eltType) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: range(eltType, ?b, ?d)) lifetime this < other {
-      append(other);
-    }
-
     @chpldoc.nodoc
     proc ref _insert(idx: int, in x: eltType)
          lifetime this < x {
diff --git a/modules/packages/YAML.chpl b/modules/packages/YAML.chpl
index 0f0174e9206e..2f880e1ee965 100644
--- a/modules/packages/YAML.chpl
+++ b/modules/packages/YAML.chpl
@@ -849,7 +849,7 @@ module YAML {
   @chpldoc.nodoc
   var _dummy_yaml_value = new owned YamlValue();
 
-  class YamlValue {
+  class YamlValue : writeSerializable {
     @chpldoc.nodoc
 
     /* index into a YAML mapping by string */
@@ -925,7 +925,7 @@ module YAML {
     }
   }
 
-  class YamlMapping: YamlValue {
+  class YamlMapping: YamlValue, writeSerializable {
     // TODO: get map(YamlValue, YamlValue) working...
     @chpldoc.nodoc
     var _map: map(string, (shared YamlValue, shared YamlValue));
@@ -1017,7 +1017,7 @@ module YAML {
     }
   }
 
-  class YamlSequence: YamlValue {
+  class YamlSequence: YamlValue, writeSerializable {
     @chpldoc.nodoc
     var _seq: list(shared YamlValue);
 
@@ -1088,7 +1088,7 @@ module YAML {
     }
   }
 
-  class YamlScalar: YamlValue {
+  class YamlScalar: YamlValue, writeSerializable {
     @chpldoc.nodoc
     var yamlType: YamlScalarType;
     @chpldoc.nodoc
@@ -1207,7 +1207,7 @@ module YAML {
     }
   }
 
-  class YamlAlias: YamlValue {
+  class YamlAlias: YamlValue, writeSerializable {
     @chpldoc.nodoc
     var _alias: string;
 
@@ -1624,7 +1624,7 @@ module YAML {
     // Emitter wrapper
     // ----------------------------------------------------
 
-    class LibYamlEmitter {
+    class LibYamlEmitter : writeSerializable {
       var seqStyle: YamlSequenceStyle;
       var mapStyle: YamlMappingStyle;
       var scalarStyle: YamlScalarStyle;
@@ -1909,7 +1909,7 @@ module YAML {
     // Parser Wrapper
     // ----------------------------------------------------
 
-    class LibYamlParser {
+    class LibYamlParser : writeSerializable {
       var parser: yaml_parser_t;
       var event: yaml_event_t;
 
diff --git a/modules/standard/BigInteger.chpl b/modules/standard/BigInteger.chpl
index 41ca7efdeac9..5c27de43d704 100644
--- a/modules/standard/BigInteger.chpl
+++ b/modules/standard/BigInteger.chpl
@@ -170,7 +170,7 @@ module BigInteger {
   }
 
   pragma "ignore noinit"
-  record bigint {
+  record bigint : writeSerializable {
     // The underlying GMP C structure
     pragma "no init"
     @chpldoc.nodoc
@@ -429,43 +429,6 @@ module BigInteger {
       return (dbl: real, exp.safeCast(uint(32)));
     }
 
-    @deprecated(notes="bigint.size() is deprecated")
-    proc size() : c_size_t {
-      var ret: c_size_t;
-
-      if compiledForSingleLocale() {
-        ret = mpz_size(this.mpz);
-
-      } else if this.localeId == chpl_nodeID {
-        ret = mpz_size(this.mpz);
-
-      } else {
-        const thisLoc = chpl_buildLocaleID(this.localeId, c_sublocid_any);
-
-        on __primitive("chpl_on_locale_num", thisLoc) {
-          ret = mpz_size(this.mpz);
-        }
-      }
-
-      return ret;
-    }
-
-    @deprecated("bigint.sizeinbase is deprecated, use :proc:`bigint.sizeInBase` instead")
-    proc sizeinbase(base: int) : uint {
-      return sizeInBase(base).safeCast(uint);
-    }
-
-    @deprecated(notes="mpzStruct is deprecated, please use :proc:`getImpl` instead")
-    proc mpzStruct() : __mpz_struct {
-      return getImpl();
-    }
-
-    @deprecated(notes="get_d_2exp is deprecated in favor of :proc:`bigint.getD2Exp`, which returns (d, exp) instead of (exp, d).  Please use that method instead")
-    proc get_d_2exp() : (uint(32), real) {
-      var (dbl, exp) = getD2Exp();
-      return (exp, dbl);
-    }
-
     // private method
     @chpldoc.nodoc
     proc getStr(base: int = 10): string {
@@ -532,13 +495,6 @@ module BigInteger {
     compilerError("unknown bigint rounding mode");
   }
 
-  @deprecated(notes="The enum Round is deprecated, please use the enum :enum:`roundingMode` instead")
-  enum Round {
-    DOWN = -1,
-    ZERO =  0,
-    UP   =  1
-  }
-
   /* An enumeration of the different rounding strategies, for use with e.g.
      :proc:`~BigInteger.divQ` to determine how to round the quotient when performing
      the computation.
@@ -1661,28 +1617,6 @@ module BigInteger {
       return false;
   }
 
-  @deprecated("bigint.powm method is deprecated, please use the standalone function :proc:`~BigInteger.powMod` instead")
-  proc ref bigint.powm(const ref base: bigint,
-                   const ref exp:  bigint,
-                   const ref mod:  bigint) {
-    BigInteger.powMod(this, base, exp, mod);
-  }
-
-  @deprecated("bigint.powm method is deprecated, please use the standalone function :proc:`~BigInteger.powMod` instead")
-  proc ref bigint.powm(const ref base: bigint,
-                             exp:  int,
-                   const ref mod:  bigint) {
-    BigInteger.powMod(this, base, exp, mod);
-  }
-
-  @deprecated("bigint.powm method is deprecated, please use the standalone function :proc:`~BigInteger.powMod` instead")
-  proc bigint.powm(const ref base: bigint,
-                             exp:  uint,
-                   const ref mod:  bigint) {
-    BigInteger.powMod(this, base, exp, mod);
-  }
-
-
   /*
     Set ``result`` to the result of ``(base**exp) modulo mod``.
 
@@ -3856,34 +3790,6 @@ module BigInteger {
   @deprecated(notes="bigint.abs method is deprecated - please use the standalone function :proc:`~BigInteger.abs`")
   proc ref bigint.abs(const ref a: bigint) do BigInteger.abs(this, a);
 
-  @deprecated("bigint.div_q using Round is deprecated, use the standalone function :proc:`~BigInteger.div` with :enum:`roundingMode` instead")
-  proc ref bigint.div_q(const ref n: bigint,
-                    const ref d: bigint,
-                    param     rounding = Round.ZERO) {
-    use Round;
-    if (rounding == UP) {
-      BigInteger.div(this, n, d, roundingMode.up);
-    } else if (rounding == ZERO) {
-      BigInteger.div(this, n, d, roundingMode.zero);
-    } else {
-      BigInteger.div(this, n, d, roundingMode.down);
-    }
-  }
-
-  @deprecated("bigint.div_q using Round is deprecated, use the standalone function :proc:`~BigInteger.div` with :enum:`roundingMode` instead")
-  proc ref bigint.div_q(const ref n: bigint,
-                              d: integral,
-                    param     rounding = Round.ZERO) {
-    use Round;
-    if (rounding == UP) {
-      BigInteger.div(this, n, d, roundingMode.up);
-    } else if (rounding == ZERO) {
-      BigInteger.div(this, n, d, roundingMode.zero);
-    } else {
-      BigInteger.div(this, n, d, roundingMode.down);
-    }
-  }
-
   @deprecated("divQ is deprecated - please use :proc:`div` with :enum:`roundingMode` instead")
   proc divQ(ref result: bigint,
             const ref numer: bigint,
diff --git a/modules/standard/CTypes.chpl b/modules/standard/CTypes.chpl
index cde556a850e3..fad2cc2433ab 100644
--- a/modules/standard/CTypes.chpl
+++ b/modules/standard/CTypes.chpl
@@ -150,7 +150,7 @@ module CTypes {
   pragma "no default functions"
   pragma "no wide class"
   pragma "c_ptr class"
-  class c_ptr {
+  class c_ptr : writeSerializable {
     //   Similar to _ddata from ChapelBase, but differs
     //   from _ddata because it can never be wide.
 
@@ -203,7 +203,7 @@ module CTypes {
   pragma "no wide class"
   pragma "c_ptr class"
   pragma "c_ptrConst class"
-  class c_ptrConst {
+  class c_ptrConst : writeSerializable {
     /*
        The type that this pointer points to, which can be queried like so:
 
@@ -258,7 +258,7 @@ module CTypes {
   */
   pragma "c_array record"
   pragma "default intent is ref if modified"
-  record c_array {
+  record c_array : writeSerializable {
     /*
        The array element type, which can be queried like so:
 
diff --git a/modules/standard/ChapelIO.chpl b/modules/standard/ChapelIO.chpl
index 828448ee01ed..07de6f67db0d 100644
--- a/modules/standard/ChapelIO.chpl
+++ b/modules/standard/ChapelIO.chpl
@@ -668,6 +668,7 @@ module ChapelIO {
   proc locale.serialize(writer, ref serializer) throws {
     writer.write(this._instance);
   }
+  locale implements writeSerializable;
 
   @chpldoc.nodoc
   proc _ddata.writeThis(f) throws {
@@ -680,6 +681,7 @@ module ChapelIO {
     compilerWarning("printing _ddata class");
     writer.write("<_ddata class cannot be printed>");
   }
+  implements writeSerializable(_ddata);
 
   proc chpl_taskID_t.writeThis(f) throws {
     f.write(this : uint(64));
@@ -783,6 +785,7 @@ module ChapelIO {
     }
     des.endTuple();
   }
+  implements readDeserializable(_tuple);
 
   @chpldoc.nodoc
   proc const _tuple.serialize(writer, ref serializer) throws {
@@ -793,6 +796,31 @@ module ChapelIO {
     }
     ser.endTuple();
   }
+  implements writeSerializable(_tuple);
+
+  proc _iteratorRecord.writeThis(f) throws {
+    var first: bool = true;
+    for e in this {
+      if !first then
+        f.write(" ");
+      else
+        first = false;
+      f.write(e);
+    }
+  }
+
+  @chpldoc.nodoc
+  proc _iteratorRecord.serialize(writer, ref serializer) throws {
+    if serializer.type == IO.defaultSerializer {
+      writeThis(writer);
+    } else {
+      if chpl_warnUnstable then
+        compilerWarning("Serialization of iterators with non-default Serializer is unstable, and may change in the future");
+      var ser = serializer.startList(writer, -1);
+      for e in this do ser.writeElement(e);
+      ser.endList();
+    }
+  }
 
   // Moved here to avoid circular dependencies in ChapelRange
   // Write implementation for ranges
@@ -829,8 +857,15 @@ module ChapelIO {
 
   @chpldoc.nodoc
   proc range.serialize(writer, ref serializer) throws {
-    writeThis(writer);
+    if serializer.type == defaultSerializer {
+      writeThis(writer);
+    } else {
+      if chpl_warnUnstable then
+        compilerWarning("Serialization of ranges with non-default Serializer is unstable, and may change in the future");
+      writer.write(this:string);
+    }
   }
+  implements writeSerializable(range);
 
   @chpldoc.nodoc
   proc ref range.readThis(f) throws {
@@ -846,7 +881,7 @@ module ChapelIO {
       use strideKind;
       select strides {
         when one      do if strideVal != 1 then expectedStride = "stride 1";
-        when negOne   do if strideVal != 1 then expectedStride = "stride -1";
+        when negOne   do if strideVal != -1 then expectedStride = "stride -1";
         when positive do if strideVal < 0 then expectedStride = "a positive";
         when negative do if strideVal > 0 then expectedStride = "a negative";
         when any      do;
@@ -855,8 +890,9 @@ module ChapelIO {
         "for a range with strides=" + strides:string + ", expected " +
         (if expectedStride.size > 2 then expectedStride + " stride"
          else expectedStride) + ", got stride ", strideVal:string);
+
       if ! hasParamStride() then
-        _stride = strideVal;
+        this = (this by strideVal):this.type;
     }
 
     if f.matchLiteral(" align ") {
@@ -865,15 +901,25 @@ module ChapelIO {
         // It is valid to align any range. In this case we do not store
         // the alignment at runtime because it always normalizes to 0.
       } else {
-        _alignment = chpl__mod(alignVal, _stride);
+        this = (this align alignVal):this.type;
       }
     }
   }
 
   @chpldoc.nodoc
   proc ref range.deserialize(reader, ref deserializer) throws {
-    readThis(reader);
+    if deserializer.type == IO.defaultDeserializer {
+      readThis(reader);
+    } else {
+      if chpl_warnUnstable then
+        compilerWarning("Deserialization of ranges with non-default Deserializer is unstable, and may change in the future");
+      const data = reader.read(string);
+      var f = openMemFile();
+      f.writer().write(data);
+      readThis(f.reader());
+    }
   }
+  implements readDeserializable(range);
 
   @chpldoc.nodoc
   proc range.init(type idxType = int,
@@ -882,8 +928,9 @@ module ChapelIO {
                   reader: fileReader(?),
                   ref deserializer) throws {
     this.init(idxType, bounds, strides);
-    this.readThis(reader);
+    this.deserialize(reader, deserializer);
   }
+  implements initDeserializable(range);
 
   @chpldoc.nodoc
   override proc LocaleModel.writeThis(f) throws {
@@ -895,6 +942,7 @@ module ChapelIO {
   override proc LocaleModel.serialize(writer, ref serializer) throws {
     writeThis(writer);
   }
+  LocaleModel implements writeSerializable;
 
   /* Errors can be printed out. In that event, they will
      show information about the error including the result
@@ -909,6 +957,7 @@ module ChapelIO {
   override proc Error.serialize(writer, ref serializer) throws {
     writer.write(chpl_describe_error(this));
   }
+  Error implements writeSerializable;
 
   /* Equivalent to ``try! stdout.write``. See :proc:`IO.fileWriter.write` */
   proc write(const args ...?n) {
diff --git a/modules/standard/CommDiagnostics.chpl b/modules/standard/CommDiagnostics.chpl
index 509f5b84b8d0..090cec8cdb50 100644
--- a/modules/standard/CommDiagnostics.chpl
+++ b/modules/standard/CommDiagnostics.chpl
@@ -344,6 +344,8 @@ module CommDiagnostics
    */
   type commDiagnostics = chpl_commDiagnostics;
 
+  commDiagnostics implements writeSerializable;
+
   private extern proc chpl_comm_startVerbose(stacktrace: bool,
                                              print_unstable: bool);
 
diff --git a/modules/standard/Heap.chpl b/modules/standard/Heap.chpl
index 529b426fc4a6..fdec24e92022 100644
--- a/modules/standard/Heap.chpl
+++ b/modules/standard/Heap.chpl
@@ -89,7 +89,7 @@ module Heap {
     }
   }
 
-  record heap {
+  record heap : writeSerializable {
 
     /* The type of the elements contained in this heap. */
     type eltType;
diff --git a/modules/standard/IO.chpl b/modules/standard/IO.chpl
index 9ff10fc95efe..9a30d65487b8 100644
--- a/modules/standard/IO.chpl
+++ b/modules/standard/IO.chpl
@@ -2361,7 +2361,7 @@ private proc defaultSerializeVal(param writing : bool,
 }
 
 @chpldoc.nodoc
-class _serializeWrapper {
+class _serializeWrapper : writeSerializable {
   type T;
   var member: T;
   // TODO: Needed to avoid a weird memory error in the following test in
@@ -3775,7 +3775,7 @@ proc fileWriter.withSerializer(in serializer: ?st) : fileWriter(this._kind, this
 // represents a Unicode codepoint
 // used to pass codepoints to read and write to avoid duplicating code
 @chpldoc.nodoc
-record _internalIoChar {
+record _internalIoChar : writeSerializable {
   /* The codepoint value */
   var ch:int(32);
   @chpldoc.nodoc
@@ -3849,7 +3849,7 @@ When reading an ioNewline, read routines will skip any character sequence
 type ioNewline = chpl_ioNewline;
 
 @chpldoc.nodoc
-record chpl_ioNewline {
+record chpl_ioNewline : writeSerializable {
   /*
     Normally, we will skip anything at all to get to a ``\n``,
     but if skipWhitespaceOnly is set, it will be an error
@@ -3888,7 +3888,7 @@ will return an error for incorrectly formatted input
 type ioLiteral = chpl_ioLiteral;
 
 @chpldoc.nodoc
-record chpl_ioLiteral {
+record chpl_ioLiteral : writeSerializable {
   /* The value of the literal */
   var val: string;
   /* Should read operations using this literal ignore and consume
@@ -10642,7 +10642,7 @@ proc _toRegex(x:?t)
 }
 
 @chpldoc.nodoc
-class _channel_regex_info {
+class _channel_regex_info : writeSerializable {
   var hasRegex = false;
   var matchedRegex = false;
   var releaseRegex = false;
diff --git a/modules/standard/List.chpl b/modules/standard/List.chpl
index f1225c260dac..d7495561c77b 100644
--- a/modules/standard/List.chpl
+++ b/modules/standard/List.chpl
@@ -142,7 +142,7 @@ module List {
 
     Unlike an array, the set of indices of a list is always `0..<size`.
   */
-  record list {
+  record list : serializable {
 
     /* The type of the elements contained in this list. */
     type eltType;
@@ -1036,21 +1036,6 @@ module List {
       return result;
     }
 
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: list(eltType, ?p)) lifetime this < other {
-      pushBack(other);
-    }
-
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: [?d] eltType) lifetime this < other {
-      pushBack(other);
-    }
-
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: range(eltType, ?b, ?d)) lifetime this < other {
-      pushBack(other);
-    }
-
     /*
       Insert an element at a given position in this list, shifting all elements
       currently at and following that index one to the right. The call
diff --git a/modules/standard/Map.chpl b/modules/standard/Map.chpl
index 290e5f6eb8ba..1043d86160f7 100644
--- a/modules/standard/Map.chpl
+++ b/modules/standard/Map.chpl
@@ -73,7 +73,7 @@ module Map {
     }
   }
 
-  record map {
+  record map : serializable {
     /* Type of map keys. */
     type keyType;
     /* Type of map values. */
diff --git a/modules/standard/Random.chpl b/modules/standard/Random.chpl
index fa3bedb01b64..9426af89f1bd 100644
--- a/modules/standard/Random.chpl
+++ b/modules/standard/Random.chpl
@@ -515,7 +515,7 @@ module Random {
      turn it into an interface.
 
   */
-  class RandomStreamInterface {
+  class RandomStreamInterface : writeSerializable {
     /*
       Specifies the type of value generated by the RandomStream.
       Not all RandomStream implementations support all types.
@@ -897,7 +897,7 @@ module Random {
          the top 16 bits into the value provided to TestU01).
 
     */
-    class PCGRandomStream {
+    class PCGRandomStream : writeSerializable {
       /*
         Specifies the type of value generated by the PCGRandomStream.
         All numeric types are supported: `int`, `uint`, `real`, `imag`,
@@ -2625,7 +2625,7 @@ module Random {
       Models a stream of pseudorandom numbers.  See the module-level
       notes for :mod:`NPBRandom` for details on the PRNG used.
     */
-    class NPBRandomStream {
+    class NPBRandomStream : writeSerializable {
       /*
         Specifies the type of value generated by the NPBRandomStream.
         Currently, only `real(64)`, `imag(64)`, and `complex(128)` are
diff --git a/modules/standard/Regex.chpl b/modules/standard/Regex.chpl
index d14bc4ff31ea..91df67b0aa7e 100644
--- a/modules/standard/Regex.chpl
+++ b/modules/standard/Regex.chpl
@@ -412,63 +412,6 @@ class BadRegexError : Error {
   }
 }
 
-/*
-   Compile a regular expression. This routine will throw a
-   class:`BadRegexError` if compilation failed.
-
-   .. warning::
-
-     This procedure is deprecated. Please use :proc:`regex.init` via ``new
-     regex()``.
-
-
-   :arg pattern: the regular expression to compile. This argument can be string
-                 or bytes. See :ref:`regular-expression-syntax` for details.
-                 Note that you may have to escape backslashes. For example, to
-                 get the regular expression ``\s``, you'd have to write
-                 ``"\\s"`` because the ``\`` is the escape character within
-                 Chapel string/bytes literals. Note that, Chapel supports
-                 triple-quoted raw string/bytes literals, which do not require
-                 escaping backslashes. For example ``"""\s"""`` or ``b"""\s"""``
-                 can be used.
-   :arg posix: (optional) set to true to disable non-POSIX regular expression
-               syntax
-   :arg literal: (optional) set to true to treat the regular expression as a
-                 literal (ie, create a regex matching ``pattern`` as a string
-                 rather than as a regular expression).
-   :arg noCapture: (optional) set to true in order to disable all capture groups
-                   in the regular expression
-   :arg ignoreCase: (optional) set to true in order to ignore case when
-                    matching. Note that this can be set inside the regular
-                    expression with ``(?i)``.
-   :arg multiLine: (optional) set to true in order to activate multiline mode
-                   (meaning that ``^`` and ``$`` match the beginning and end
-                   of a line instead of just the beginning and end of the text.
-                   Note that this can be set inside a regular expression
-                   with ``(?m)``.
-   :arg dotAll: (optional) set to true in order to allow ``.``
-               to match a newline. Note that this can be set inside the
-               regular expression with ``(?s)``.
-   :arg nonGreedy: (optional) set to true in order to prefer shorter matches for
-                   repetitions; for example, normally x* will match as many x
-                   characters as possible and x*? will match as few as possible.
-                   This flag swaps the two, so that x* will match as few as
-                   possible and x*? will match as many as possible. Note that
-                   this flag can be set inside the regular expression with
-                   ``(?U)``.
-
-   :throws BadRegexError: If the argument 'pattern' has syntactical errors.
-                          Refer to https://github.com/google/re2/blob/master/re2/re2.h
-                          for more details about error codes.
- */
-@deprecated(notes="'Regex.compile' is deprecated. Please use 'new regex()' instead.")
-proc compile(pattern: ?t, posix=false, literal=false, noCapture=false,
-             /*i*/ ignoreCase=false, /*m*/ multiLine=false, /*s*/ dotAll=false,
-             /*U*/ nonGreedy=false): regex(t) throws where t==string || t==bytes {
-  return new regex(pattern, posix, literal, noCapture, ignoreCase, multiLine,
-                   dotAll, nonGreedy);
-}
-
 /*  The regexMatch record records a regular expression search match
     or a capture group.
 
@@ -557,14 +500,13 @@ record chpl_serializeHelper {
 
 /*  This record represents a compiled regular expression. Regular expressions
     are currently cached on a per-thread basis and are reference counted.
-    To create a compiled regular expression, use the proc:`compile` function.
 
     A string-based regex can be cast to a string (resulting in the pattern that
     was compiled). A string can be cast to a string-based regex (resulting in a
     compiled regex). Same applies for bytes.
   */
 pragma "ignore noinit"
-record regex {
+record regex : serializable {
 
   @chpldoc.nodoc
   type exprType;
@@ -999,61 +941,6 @@ record regex {
     }
   }
 
-  pragma "last resort"
-  @deprecated(notes="regex.matches arguments 'captures' and 'maxmatches' are deprecated. Use 'numCaptures' and/or 'maxMatches instead.")
-  iter matches(text: exprType, param captures=0, maxmatches: int = max(int))
-  {
-    for m in matches(text, numCaptures=captures, maxMatches=maxmatches) {
-      yield m;
-    }
-  }
-
-  /* Perform the same operation as :proc:`regex.sub` but return a tuple
-     containing the new text and the number of substitutions made.
-
-     .. warning::
-
-       This method is deprecated. Please use :proc:`string.replaceAndCount`.
-
-     :arg repl: replace matches with this string or bytes
-     :arg text: the text to search and replace within
-     :type text: `string` or `bytes`
-     :arg global: if true, replace multiple matches
-     :returns: a tuple containing (new text, number of substitutions made)
-   */
-  @deprecated(notes="regex.subn is deprecated. Please use string.replaceAndCount.")
-  proc subn(repl: exprType, text: exprType, global = true ):(exprType, int)
-  {
-    if global then
-      return text.replaceAndCount(this, repl);
-    else
-      return text.replaceAndCount(this, repl, 1);
-  }
-
-  /*
-     Find matches to this regular expression and create a new string or bytes in
-     which those matches are replaced by repl.
-
-     .. warning::
-
-       This method is deprecated. Please use :proc:`string.replace` with `regex`
-       argument.
-
-     :arg repl: replace matches with this string or bytes
-     :arg text: the text to search and replace within
-     :type text: `string` or `bytes`
-     :arg global: if true, replace multiple matches
-     :returns: the new string or bytes
-   */
-  @deprecated(notes="regex.sub is deprecated. Please use string.replace.")
-  proc sub(repl: exprType, text: exprType, global = true )
-  {
-    if global then
-      return text.replace(this, repl);
-    else
-      return text.replace(this, repl, count=1);
-  }
-
   // TODO this could use _serialize to get the pattern and options
   @chpldoc.nodoc
   proc writeThis(f) throws {
diff --git a/modules/standard/Set.chpl b/modules/standard/Set.chpl
index d259d723b0ea..bd2f8e275e55 100644
--- a/modules/standard/Set.chpl
+++ b/modules/standard/Set.chpl
@@ -135,7 +135,7 @@ module Set {
     the ``parSafe`` mode is currently unstable and will eventually be replaced
     by a standalone parallel-safe set type.
   */
-  record set {
+  record set : serializable {
 
     /* The type of the elements contained in this set. */
     type eltType;
diff --git a/modules/standard/Time.chpl b/modules/standard/Time.chpl
index 49fb19b66d9e..c306fcde969c 100644
--- a/modules/standard/Time.chpl
+++ b/modules/standard/Time.chpl
@@ -333,7 +333,7 @@ module Time {
   }
 
 /* A record representing a date */
-  record date {
+  record date : serializable {
     var chpl_year, chpl_month, chpl_day: int;
 
     /* The year represented by this `date` value */
@@ -716,7 +716,7 @@ module Time {
 
 
   /* A record representing a time */
-  record time {
+  record time : serializable {
     var chpl_hour, chpl_minute, chpl_second, chpl_microsecond: int;
     var chpl_tz: shared Timezone?;
 
@@ -1135,7 +1135,7 @@ module Time {
   type datetime = dateTime;
 
   /* A record representing a combined `date` and `time` */
-  record dateTime {
+  record dateTime : serializable {
     var chpl_date: date;
     var chpl_time: time;
 
diff --git a/modules/standard/Version.chpl b/modules/standard/Version.chpl
index d790c6792ccd..7e2bd375934b 100644
--- a/modules/standard/Version.chpl
+++ b/modules/standard/Version.chpl
@@ -180,7 +180,7 @@ module Version {
     converted to a string, it is represented as ``major.minor.update (commit)``.
   */
 
-  record versionValue {
+  record versionValue : writeSerializable {
     /*
       The major version number. For version ``2.0.1``, this would be ``2``.
     */
@@ -341,7 +341,7 @@ module Version {
     converted to a string, it is represented as ``major.minor.update (commit)``.
     Unlike :type:`versionValue`, a ``version`` can be created and modified at runtime.
   */
-  record version {
+  record version : writeSerializable {
     /*
       The major version number. For version ``2.0.1``, this would be ``2``.
       Defaults to ``-1``
diff --git a/test/arrays/deitz/matrix.chpl b/test/arrays/deitz/matrix.chpl
index 1aac2ca85083..2ad5a110c7b2 100644
--- a/test/arrays/deitz/matrix.chpl
+++ b/test/arrays/deitz/matrix.chpl
@@ -1,4 +1,4 @@
-record Matrix {
+record Matrix : writeSerializable {
   type elt_type;
   var m, n: int;
   var D: domain(2) = {1..m, 1..n};
diff --git a/test/arrays/ferguson/semantic-examples/myrecord.chpl b/test/arrays/ferguson/semantic-examples/myrecord.chpl
index 918222c1e12a..194c3d258c3d 100644
--- a/test/arrays/ferguson/semantic-examples/myrecord.chpl
+++ b/test/arrays/ferguson/semantic-examples/myrecord.chpl
@@ -1,4 +1,4 @@
-record R {
+record R : writeSerializable {
   var x: int = 0;
 }
 
diff --git a/test/classes/bradc/writeclass1a.chpl b/test/classes/bradc/writeclass1a.chpl
index f47a35587b87..7bab3656f669 100644
--- a/test/classes/bradc/writeclass1a.chpl
+++ b/test/classes/bradc/writeclass1a.chpl
@@ -1,4 +1,4 @@
-class myclass {
+class myclass : writeSerializable {
   var x: int;
   var y: real;
 }
diff --git a/test/classes/bradc/writerecord1a.chpl b/test/classes/bradc/writerecord1a.chpl
index 20bf9b33cac0..4968920aeedd 100644
--- a/test/classes/bradc/writerecord1a.chpl
+++ b/test/classes/bradc/writerecord1a.chpl
@@ -1,4 +1,4 @@
-record myrecord {
+record myrecord : writeSerializable {
   var x: int;
   var y: real;
 
diff --git a/test/classes/deitz/record/record_user_write.chpl b/test/classes/deitz/record/record_user_write.chpl
index 24a531df8a9a..f1be785a6100 100644
--- a/test/classes/deitz/record/record_user_write.chpl
+++ b/test/classes/deitz/record/record_user_write.chpl
@@ -1,4 +1,4 @@
-record foo {
+record foo : writeSerializable {
   var x : int = 1;
   var y : int = 2;
   var z : int = 3;
diff --git a/test/classes/delete-free/lifetimes/issue-12164.chpl b/test/classes/delete-free/lifetimes/issue-12164.chpl
index ef56d63dbd3d..5c093ce2d6cc 100644
--- a/test/classes/delete-free/lifetimes/issue-12164.chpl
+++ b/test/classes/delete-free/lifetimes/issue-12164.chpl
@@ -1,11 +1,11 @@
-class UserError: Error {
+class UserError: Error, writeSerializable {
   var msg: string;
   proc init(s: string) { msg = s; }
   proc postinit() { writeln("init UserError"); }
   proc deinit() { writeln("deinit UserError"); }
   override proc serialize(writer, ref serializer) throws { writer.write("UserError: ", msg); }
 }
-class Logger: Error {
+class Logger: Error, writeSerializable {
   var x;
   proc init(x) { this.x = x; }
   proc postinit() { writeln("init Logger"); }
diff --git a/test/classes/errors/throws/writeThis/NoThrowDefaultGenParent.chpl b/test/classes/errors/throws/writeThis/NoThrowDefaultGenParent.chpl
index 6f8ef8514e46..29617aad8c97 100644
--- a/test/classes/errors/throws/writeThis/NoThrowDefaultGenParent.chpl
+++ b/test/classes/errors/throws/writeThis/NoThrowDefaultGenParent.chpl
@@ -2,7 +2,7 @@ class A {
   var x: int = 0;
 }
 
-class A1: A {
+class A1: A, writeSerializable {
   var y: int = 0;
 
   override proc serialize(writer, ref serializer) throws {
diff --git a/test/classes/initializers/compilerGenerated/arrayField-sync.chpl b/test/classes/initializers/compilerGenerated/arrayField-sync.chpl
index a9cb1286b275..ecea6a0bd287 100644
--- a/test/classes/initializers/compilerGenerated/arrayField-sync.chpl
+++ b/test/classes/initializers/compilerGenerated/arrayField-sync.chpl
@@ -1,5 +1,5 @@
 
-class C {
+class C : writeSerializable {
   var A : [1..10] sync int;
 
   override proc serialize(writer, ref serializer) throws {
diff --git a/test/classes/initializers/generics/reuse-class-instantiation3.chpl b/test/classes/initializers/generics/reuse-class-instantiation3.chpl
index 65c149c01b9d..b9710108cace 100644
--- a/test/classes/initializers/generics/reuse-class-instantiation3.chpl
+++ b/test/classes/initializers/generics/reuse-class-instantiation3.chpl
@@ -1,4 +1,4 @@
-class Foo {
+class Foo : writeSerializable {
   type T;
   var x: T;
 
diff --git a/test/classes/io/classIOinHierarchy-override.chpl b/test/classes/io/classIOinHierarchy-override.chpl
index 88c832a89317..2afd3e4582e1 100644
--- a/test/classes/io/classIOinHierarchy-override.chpl
+++ b/test/classes/io/classIOinHierarchy-override.chpl
@@ -2,7 +2,7 @@ class C {
   var x: int;
 }
 
-class D : C {
+class D : C, writeSerializable {
   var y: real;
 
   override proc serialize(writer, ref serializer) throws {
diff --git a/test/classes/io/halt-in-parent-class-io.chpl b/test/classes/io/halt-in-parent-class-io.chpl
index 3ed0228499f2..b9a7a0418e9f 100644
--- a/test/classes/io/halt-in-parent-class-io.chpl
+++ b/test/classes/io/halt-in-parent-class-io.chpl
@@ -1,4 +1,4 @@
-class parent {
+class parent : writeSerializable {
   var p: int;
   override proc serialize(writer, ref serializer) throws { halt("halt"); }
 }
diff --git a/test/compflags/ferguson/print-module-resolution.good b/test/compflags/ferguson/print-module-resolution.good
index d6b78d3ce8e0..d243919bc0c6 100644
--- a/test/compflags/ferguson/print-module-resolution.good
+++ b/test/compflags/ferguson/print-module-resolution.good
@@ -166,6 +166,8 @@ LocalesArray
   from print-module-resolution.ChapelStandard.LocalesArray
 ChapelAutoLocalAccess
   from print-module-resolution.ChapelStandard.ChapelAutoLocalAccess
+ChapelIOSerialize
+  from print-module-resolution.ChapelStandard.ChapelIOSerialize
 ChapelTaskID
   from print-module-resolution.ChapelStandard.ChapelTaskID
 ChapelTaskTable
diff --git a/test/constrained-generics/random/MyRandom.chpl b/test/constrained-generics/random/MyRandom.chpl
index 08a4da988d1e..b0b30ec5bd97 100644
--- a/test/constrained-generics/random/MyRandom.chpl
+++ b/test/constrained-generics/random/MyRandom.chpl
@@ -468,7 +468,7 @@ module MyRandom {
      turn it into an interface.
 
   */
-  class RandomStreamInterface {
+  class RandomStreamInterface : writeSerializable {
     /*
       Specifies the type of value generated by the RandomStream.
       Not all RandomStream implementations support all types.
@@ -849,7 +849,7 @@ module MyRandom {
          the top 16 bits into the value provided to TestU01).
 
     */
-    class PCGRandomStream {
+    class PCGRandomStream : writeSerializable {
       /*
         Specifies the type of value generated by the PCGRandomStream.
         All numeric types are supported: `int`, `uint`, `real`, `imag`,
@@ -2474,7 +2474,7 @@ module MyRandom {
       Models a stream of pseudorandom numbers.  See the module-level
       notes for :mod:`NPBRandom` for details on the PRNG used.
     */
-    class NPBRandomStream {
+    class NPBRandomStream : writeSerializable {
       /*
         Specifies the type of value generated by the NPBRandomStream.
         Currently, only `real(64)`, `imag(64)`, and `complex(128)` are
diff --git a/test/demo/review_060130/history_accumulator.chpl b/test/demo/review_060130/history_accumulator.chpl
index 4cfb9612469a..96f5054909e3 100644
--- a/test/demo/review_060130/history_accumulator.chpl
+++ b/test/demo/review_060130/history_accumulator.chpl
@@ -1,4 +1,4 @@
-record history_real {
+record history_real : writeSerializable {
   param size : int;
   var h : size*real;
   var f : real;
diff --git a/test/deprecated/BigInteger/deprecateGetd2exp.chpl b/test/deprecated/BigInteger/deprecateGetd2exp.chpl
deleted file mode 100644
index fa84ffb62047..000000000000
--- a/test/deprecated/BigInteger/deprecateGetd2exp.chpl
+++ /dev/null
@@ -1,6 +0,0 @@
-use BigInteger;
-
-var a: bigint = 64;
-var (exp, d) = a.get_d_2exp();
-writeln(d); // expect .5
-writeln(exp); // expect 7 (.5 * 2^7 = 64)
diff --git a/test/deprecated/BigInteger/deprecateGetd2exp.good b/test/deprecated/BigInteger/deprecateGetd2exp.good
deleted file mode 100644
index 71828cb51b20..000000000000
--- a/test/deprecated/BigInteger/deprecateGetd2exp.good
+++ /dev/null
@@ -1,3 +0,0 @@
-deprecateGetd2exp.chpl:4: warning: get_d_2exp is deprecated in favor of bigint.getD2Exp, which returns (d, exp) instead of (exp, d).  Please use that method instead
-0.5
-7
diff --git a/test/deprecated/BigInteger/deprecateMpzStruct.chpl b/test/deprecated/BigInteger/deprecateMpzStruct.chpl
deleted file mode 100644
index 7145b96d07d2..000000000000
--- a/test/deprecated/BigInteger/deprecateMpzStruct.chpl
+++ /dev/null
@@ -1,9 +0,0 @@
-use BigInteger;
-use GMP;
-
-config const debug = false;
-
-var a: bigint = 14;
-var impl = a.mpzStruct();
-var ret = chpl_gmp_mpz_nlimbs((impl,));
-if debug then writeln(ret);
diff --git a/test/deprecated/BigInteger/deprecateMpzStruct.good b/test/deprecated/BigInteger/deprecateMpzStruct.good
deleted file mode 100644
index 5be1fc448562..000000000000
--- a/test/deprecated/BigInteger/deprecateMpzStruct.good
+++ /dev/null
@@ -1 +0,0 @@
-deprecateMpzStruct.chpl:7: warning: mpzStruct is deprecated, please use getImpl instead
diff --git a/test/deprecated/BigInteger/deprecatePowm.chpl b/test/deprecated/BigInteger/deprecatePowm.chpl
deleted file mode 100644
index 475f97b4d7a8..000000000000
--- a/test/deprecated/BigInteger/deprecatePowm.chpl
+++ /dev/null
@@ -1,16 +0,0 @@
-use BigInteger;
-
-// Tests the power functions
-
-// powers
-var a = new bigint( 2);
-var b = new bigint( 4);
-var c = new bigint(10);
-var d = new bigint();
-
-a.powm(a, b, c);          // a = a^b mod c
-writeln("2^4 mod 10 = ", a);
-
-a.set(2);
-a.powm(a, 3, c);          // a = a^3 mod c
-writeln("2^3 mod 10 = ", a);
diff --git a/test/deprecated/BigInteger/deprecatePowm.good b/test/deprecated/BigInteger/deprecatePowm.good
deleted file mode 100644
index 5ae0be4e7e77..000000000000
--- a/test/deprecated/BigInteger/deprecatePowm.good
+++ /dev/null
@@ -1,4 +0,0 @@
-deprecatePowm.chpl:11: warning: bigint.powm method is deprecated, please use the standalone function powMod instead
-deprecatePowm.chpl:15: warning: bigint.powm method is deprecated, please use the standalone function powMod instead
-2^4 mod 10 = 6
-2^3 mod 10 = 8
diff --git a/test/deprecated/BigInteger/deprecateRound.chpl b/test/deprecated/BigInteger/deprecateRound.chpl
deleted file mode 100644
index 792474fee5a0..000000000000
--- a/test/deprecated/BigInteger/deprecateRound.chpl
+++ /dev/null
@@ -1,36 +0,0 @@
-use BigInteger;
-
-param down = Round.DOWN; // Should trigger the warning
-param zero = Round.ZERO; // Should trigger the warning
-param up = Round.UP;     // Should trigger the warning
-
-// Every non-writeln function call after this point should trigger the warning
-var a = new bigint(  8);
-var c = new bigint(-27);
-var d = new bigint();
-
-d.div_q(c, a, up);
-writeln(d);
-
-d.div_q(c, a, down);
-writeln(d);
-
-d.div_q(c, a, zero); // same as UP   for negative integers
-writeln(d);
-
-writeln();
-
-neg(c, c);
-d.div_q(c, 8, up);
-writeln(d);
-
-d.div_q(c, 8, down);
-writeln(d);
-
-d.div_q(c, 8, zero); // same as DOWN for positive integers
-writeln(d);
-
-writeln();
-// Check default arguments, too
-d.div_q(c, a); // same as UP   for negative integers
-writeln(d);
diff --git a/test/deprecated/BigInteger/deprecateRound.good b/test/deprecated/BigInteger/deprecateRound.good
deleted file mode 100644
index 72e5a9f3d82d..000000000000
--- a/test/deprecated/BigInteger/deprecateRound.good
+++ /dev/null
@@ -1,19 +0,0 @@
-deprecateRound.chpl:3: warning: The enum Round is deprecated, please use the enum roundingMode instead
-deprecateRound.chpl:4: warning: The enum Round is deprecated, please use the enum roundingMode instead
-deprecateRound.chpl:5: warning: The enum Round is deprecated, please use the enum roundingMode instead
-deprecateRound.chpl:12: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:15: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:18: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:24: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:27: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:30: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
-deprecateRound.chpl:35: warning: bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead
--3
--4
--3
-
-4
-3
-3
-
-3
diff --git a/test/deprecated/BigInteger/deprecateSize.chpl b/test/deprecated/BigInteger/deprecateSize.chpl
deleted file mode 100644
index 3811a7b14b4b..000000000000
--- a/test/deprecated/BigInteger/deprecateSize.chpl
+++ /dev/null
@@ -1,10 +0,0 @@
-use BigInteger;
-
-// Tests the size deprecation message
-var a = new bigint(-65533256);
-var b = new bigint(-639283632585);
-
-var c = a * b * a;
-writeln(a, " has ", a.size(), " limb(s)");
-writeln(b, " has ", b.size(), " limb(s)");
-writeln(c, " has ", c.size(), " limb(s)");
diff --git a/test/deprecated/BigInteger/deprecateSize.good b/test/deprecated/BigInteger/deprecateSize.good
deleted file mode 100644
index 48e0d15fa1ee..000000000000
--- a/test/deprecated/BigInteger/deprecateSize.good
+++ /dev/null
@@ -1,6 +0,0 @@
-deprecateSize.chpl:8: warning: bigint.size() is deprecated
-deprecateSize.chpl:9: warning: bigint.size() is deprecated
-deprecateSize.chpl:10: warning: bigint.size() is deprecated
--65533256 has 1 limb(s)
--639283632585 has 1 limb(s)
--2745472373880471808926250560 has 2 limb(s)
diff --git a/test/deprecated/BigInteger/deprecateSize.skipif b/test/deprecated/BigInteger/deprecateSize.skipif
deleted file mode 100644
index 9a19fb3ac728..000000000000
--- a/test/deprecated/BigInteger/deprecateSize.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_TARGET_PLATFORM == linux32
diff --git a/test/deprecated/BigInteger/deprecateSizeinbase.chpl b/test/deprecated/BigInteger/deprecateSizeinbase.chpl
deleted file mode 100644
index 0172c4df6da8..000000000000
--- a/test/deprecated/BigInteger/deprecateSizeinbase.chpl
+++ /dev/null
@@ -1,10 +0,0 @@
-use BigInteger;
-
-// Tests the sizeinbase deprecation message
-var a = new bigint(-65536);
-var b = new bigint(129);
-
-writeln(a, " is ", a.sizeinbase(10), " digits in base 10");
-writeln(a, " is ", a.sizeinbase(2), " digits in base 2");
-writeln(b, " is ", b.sizeinbase(10), " digits in base 10");
-writeln(b, " is ", b.sizeinbase(2), " digits in base 2");
diff --git a/test/deprecated/BigInteger/deprecateSizeinbase.good b/test/deprecated/BigInteger/deprecateSizeinbase.good
deleted file mode 100644
index fc4200b824ee..000000000000
--- a/test/deprecated/BigInteger/deprecateSizeinbase.good
+++ /dev/null
@@ -1,8 +0,0 @@
-deprecateSizeinbase.chpl:7: warning: bigint.sizeinbase is deprecated, use bigint.sizeInBase instead
-deprecateSizeinbase.chpl:8: warning: bigint.sizeinbase is deprecated, use bigint.sizeInBase instead
-deprecateSizeinbase.chpl:9: warning: bigint.sizeinbase is deprecated, use bigint.sizeInBase instead
-deprecateSizeinbase.chpl:10: warning: bigint.sizeinbase is deprecated, use bigint.sizeInBase instead
--65536 is 6 digits in base 10
--65536 is 17 digits in base 2
-129 is 3 digits in base 10
-129 is 8 digits in base 2
diff --git a/test/deprecated/CyclicStridable.chpl b/test/deprecated/CyclicStridable.chpl
index 2250ff0868e1..5122e158ee46 100644
--- a/test/deprecated/CyclicStridable.chpl
+++ b/test/deprecated/CyclicStridable.chpl
@@ -188,7 +188,7 @@ where the updates are made.
 
 This distribution has not been tuned for performance.
 */
-class Cyclic: BaseDist {
+class Cyclic: BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
 
@@ -1041,7 +1041,7 @@ proc CyclicArr.setRADOpt(val=true) {
   if doRADOpt then setupRADOpt();
 }
 
-class LocCyclicArr {
+class LocCyclicArr : writeSerializable {
   type eltType;
   param rank: int;
   type idxType;
diff --git a/test/deprecated/Map/mapIterators.good b/test/deprecated/Map/mapIterators.good
index 115f4f6d241d..ae3db1a1622a 100644
--- a/test/deprecated/Map/mapIterators.good
+++ b/test/deprecated/Map/mapIterators.good
@@ -1,5 +1,5 @@
-$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:392: In function '_getIterator':
-$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:393: warning: 'map.these' is deprecated. Consider 'map.keys' to iterate over keys or 'map.values' to iterate over values.
+$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:376: In function '_getIterator':
+$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:377: warning: 'map.these' is deprecated. Consider 'map.keys' to iterate over keys or 'map.values' to iterate over values.
   mapIterators.chpl:6: called as _getIterator(x: map(int(64),int(64),false))
 mapIterators.chpl:9: warning: 'map.items' is deprecated. Consider 'map.keys' to iterate over keys or 'map.values' to iterate over values.
 0
diff --git a/test/deprecated/listExtend.chpl b/test/deprecated/listExtend.chpl
deleted file mode 100644
index 312893b3658d..000000000000
--- a/test/deprecated/listExtend.chpl
+++ /dev/null
@@ -1,16 +0,0 @@
-use List;
-
-config const n = 3;
-
-var theList = new list(int);
-
-var r = 1..n;
-var a: [r] int;
-var otherList = new list(int);
-for i in r do otherList.pushBack(i);
-
-theList.extend(r);
-theList.extend(a);
-theList.extend(otherList);
-
-writeln(theList);
diff --git a/test/deprecated/listExtend.good b/test/deprecated/listExtend.good
deleted file mode 100644
index d0137e11f25d..000000000000
--- a/test/deprecated/listExtend.good
+++ /dev/null
@@ -1,4 +0,0 @@
-listExtend.chpl:12: warning: list.extend is deprecated, please use list.append
-listExtend.chpl:13: warning: list.extend is deprecated, please use list.append
-listExtend.chpl:14: warning: list.extend is deprecated, please use list.append
-[1, 2, 3, 0, 0, 0, 1, 2, 3]
diff --git a/test/deprecated/oMap.chpl b/test/deprecated/oMap.chpl
deleted file mode 100644
index 49f0b3e52a6f..000000000000
--- a/test/deprecated/oMap.chpl
+++ /dev/null
@@ -1,7 +0,0 @@
-use OrderedMap;
-
-var omap = new orderedMap(int, int);
-
-omap[5] = 10;
-
-writeln(omap);
diff --git a/test/deprecated/oMap.good b/test/deprecated/oMap.good
deleted file mode 100644
index 06187dbdff38..000000000000
--- a/test/deprecated/oMap.good
+++ /dev/null
@@ -1,2 +0,0 @@
-oMap.chpl:1: warning: The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap
-{5: 10}
diff --git a/test/deprecated/oSet.chpl b/test/deprecated/oSet.chpl
deleted file mode 100644
index 5d748091ea1e..000000000000
--- a/test/deprecated/oSet.chpl
+++ /dev/null
@@ -1,8 +0,0 @@
-use OrderedSet;
-
-var oset = new orderedSet(int);
-
-oset.add(5);
-oset.add(5);
-
-writeln(oset.size);
diff --git a/test/deprecated/oSet.good b/test/deprecated/oSet.good
deleted file mode 100644
index f677331471c1..000000000000
--- a/test/deprecated/oSet.good
+++ /dev/null
@@ -1,2 +0,0 @@
-oSet.chpl:1: warning: The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap
-1
diff --git a/test/deprecated/regexCompile.chpl b/test/deprecated/regexCompile.chpl
deleted file mode 100644
index 1bb445b9bd4d..000000000000
--- a/test/deprecated/regexCompile.chpl
+++ /dev/null
@@ -1,5 +0,0 @@
-use Regex;
-
-var r = compile("a+");
-
-writeln(r.match("aabb"));
diff --git a/test/deprecated/regexCompile.good b/test/deprecated/regexCompile.good
deleted file mode 100644
index 77ead0536d0e..000000000000
--- a/test/deprecated/regexCompile.good
+++ /dev/null
@@ -1,2 +0,0 @@
-regexCompile.chpl:3: warning: 'Regex.compile' is deprecated. Please use 'new regex()' instead.
-(matched = true, byteOffset = 0, numBytes = 2)
diff --git a/test/deprecated/regexCompile.skipif b/test/deprecated/regexCompile.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexCompile.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/regexMatchesArgs.chpl b/test/deprecated/regexMatchesArgs.chpl
deleted file mode 100644
index d82a20aec3e0..000000000000
--- a/test/deprecated/regexMatchesArgs.chpl
+++ /dev/null
@@ -1,9 +0,0 @@
-use Regex;
-
-var text = "foo 123 bar 345";
-
-var r = new regex("\\d+");
-
-for m in r.matches(text, captures=0, maxmatches=1) {
-  writeln(m);
-}
diff --git a/test/deprecated/regexMatchesArgs.good b/test/deprecated/regexMatchesArgs.good
deleted file mode 100644
index 6c168ae30abe..000000000000
--- a/test/deprecated/regexMatchesArgs.good
+++ /dev/null
@@ -1,2 +0,0 @@
-regexMatchesArgs.chpl:7: warning: regex.matches arguments 'captures' and 'maxmatches' are deprecated. Use 'numCaptures' and/or 'maxMatches instead.
-((matched = true, byteOffset = 4, numBytes = 3),)
diff --git a/test/deprecated/regexMatchesArgs.skipif b/test/deprecated/regexMatchesArgs.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexMatchesArgs.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/regexSubSubn.chpl b/test/deprecated/regexSubSubn.chpl
deleted file mode 100644
index b1b8ba351fe5..000000000000
--- a/test/deprecated/regexSubSubn.chpl
+++ /dev/null
@@ -1,7 +0,0 @@
-use Regex;
-
-var myStr = "AABBCC";
-var r = new regex("A.*B");
-
-writeln(r.sub(myStr, "x"));
-writeln(r.subn(myStr, "x"));
diff --git a/test/deprecated/regexSubSubn.good b/test/deprecated/regexSubSubn.good
deleted file mode 100644
index 7be42567d1f0..000000000000
--- a/test/deprecated/regexSubSubn.good
+++ /dev/null
@@ -1,4 +0,0 @@
-regexSubSubn.chpl:6: warning: regex.sub is deprecated. Please use string.replace.
-regexSubSubn.chpl:7: warning: regex.subn is deprecated. Please use string.replaceAndCount.
-x
-(x, 0)
diff --git a/test/deprecated/regexSubSubn.skipif b/test/deprecated/regexSubSubn.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexSubSubn.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/unrolledLinkedListExtend.chpl b/test/deprecated/unrolledLinkedListExtend.chpl
deleted file mode 100644
index da05a14cc767..000000000000
--- a/test/deprecated/unrolledLinkedListExtend.chpl
+++ /dev/null
@@ -1,16 +0,0 @@
-use UnrolledLinkedList;
-
-config const n = 3;
-
-var theList = new unrolledLinkedList(int);
-
-var r = 1..n;
-var a: [r] int;
-var otherList = new unrolledLinkedList(int);
-for i in r do otherList.append(i);
-
-theList.extend(r);
-theList.extend(a);
-theList.extend(otherList);
-
-writeln(theList);
diff --git a/test/deprecated/unrolledLinkedListExtend.good b/test/deprecated/unrolledLinkedListExtend.good
deleted file mode 100644
index f4bbe98e4df2..000000000000
--- a/test/deprecated/unrolledLinkedListExtend.good
+++ /dev/null
@@ -1,4 +0,0 @@
-unrolledLinkedListExtend.chpl:12: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-unrolledLinkedListExtend.chpl:13: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-unrolledLinkedListExtend.chpl:14: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-[1, 2, 3, 0, 0, 0, 1, 2, 3]
diff --git a/test/distributions/diten/Cyclic.chpl b/test/distributions/diten/Cyclic.chpl
index a92a150e95d2..d77beea96dca 100644
--- a/test/distributions/diten/Cyclic.chpl
+++ b/test/distributions/diten/Cyclic.chpl
@@ -15,7 +15,7 @@ enum IteratorType { leader, follower };
 //
 // The distribution class
 //
-class Cyclic1DDist {
+class Cyclic1DDist : writeSerializable {
   //
   // The distribution's index type and domain's global index type
   //
@@ -167,7 +167,7 @@ class Cyclic1DDist {
 //
 // A per-locale local distribution class
 //
-class LocCyclic1DDist {
+class LocCyclic1DDist : writeSerializable {
   // 
   // The distribution's index type and domain's global index type
   //
@@ -214,7 +214,7 @@ class LocCyclic1DDist {
 //
 // The global domain class
 //
-class Cyclic1DDom {
+class Cyclic1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -383,7 +383,7 @@ class Cyclic1DDom {
 //
 // the local domain class
 //
-class LocCyclic1DDom {
+class LocCyclic1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -455,7 +455,7 @@ private use IO;
 //
 // the global array class
 //
-class Cyclic1DArr {
+class Cyclic1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -575,7 +575,7 @@ class Cyclic1DArr {
 //
 // the local array class
 //
-class LocCyclic1DArr {
+class LocCyclic1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
diff --git a/test/exercises/duplicates/forStudents/FileHashing.chpl b/test/exercises/duplicates/forStudents/FileHashing.chpl
index d89c50089fb1..ac24c7df1f99 100644
--- a/test/exercises/duplicates/forStudents/FileHashing.chpl
+++ b/test/exercises/duplicates/forStudents/FileHashing.chpl
@@ -3,7 +3,7 @@ module FileHashing {
   /* SHA256Hash is a record storing a SHA256 hash value.
      It supports comparison and writeln.
    */
-  record SHA256Hash : hashable {
+  record SHA256Hash : hashable, writeSerializable {
     /* The actual hash value */
     var hashVal: 8*uint(32);
 
diff --git a/test/functions/ferguson/ref-pair/tuples/bug-12282.chpl b/test/functions/ferguson/ref-pair/tuples/bug-12282.chpl
index 71e90c891ed5..71fbca3d986a 100644
--- a/test/functions/ferguson/ref-pair/tuples/bug-12282.chpl
+++ b/test/functions/ferguson/ref-pair/tuples/bug-12282.chpl
@@ -1,4 +1,4 @@
-record item {
+record item : writeSerializable {
   var data: int = 0;
 
   proc serialize(writer, ref serializer) throws { writer.write(data); }
diff --git a/test/functions/generic/poi/bug-14185.chpl b/test/functions/generic/poi/bug-14185.chpl
index bf9ffade9727..ede2ea833cc3 100644
--- a/test/functions/generic/poi/bug-14185.chpl
+++ b/test/functions/generic/poi/bug-14185.chpl
@@ -1,5 +1,5 @@
 module NewTypeMod {
-    record NewType {
+    record NewType : writeSerializable {
         var x: int;
 
         proc serialize(writer, ref serializer) throws {
diff --git a/test/io/bradc/multilocale/testdistwrite.chpl b/test/io/bradc/multilocale/testdistwrite.chpl
index 9c703fda8b7c..93266f11ec6e 100644
--- a/test/io/bradc/multilocale/testdistwrite.chpl
+++ b/test/io/bradc/multilocale/testdistwrite.chpl
@@ -2,7 +2,7 @@ class D {
   var me: int;
 }
 
-class C {
+class C : writeSerializable {
   var Ds: [LocaleSpace] unmanaged D?;
 
   override proc serialize(writer, ref serializer) throws {
diff --git a/test/io/errors/writeThisUserError.chpl b/test/io/errors/writeThisUserError.chpl
index 12175c565110..501202a223a0 100644
--- a/test/io/errors/writeThisUserError.chpl
+++ b/test/io/errors/writeThisUserError.chpl
@@ -5,7 +5,7 @@
 //
 use IO;
 
-record foo {
+record foo : writeSerializable {
   var x: int = 0;
 
   proc serialize(writer:fileWriter(?), ref serializer) throws {
diff --git a/test/io/ferguson/readThis/read-write-locale-arg.chpl b/test/io/ferguson/readThis/read-write-locale-arg.chpl
index e16e6ffaf9e2..6a7fa03cc5f6 100644
--- a/test/io/ferguson/readThis/read-write-locale-arg.chpl
+++ b/test/io/ferguson/readThis/read-write-locale-arg.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class A {
+class A : writeSerializable {
   var x:int;
   override proc serialize(writer, ref serializer) throws {
     var loc = writer.readWriteThisFromLocale();
@@ -9,7 +9,7 @@ class A {
   }
 }
 
-class B {
+class B : readDeserializable, initDeserializable {
   var x:int;
   proc init(x: int = 0) { this.x = x; }
   proc init(reader: fileReader(?), ref deserializer) {
@@ -24,7 +24,7 @@ class B {
   }
 }
 
-class C {
+class C : serializable {
   var x:int;
   proc init(x: int = 0) { this.x = x; }
   proc init(reader: fileReader(?), ref deserializer) {
diff --git a/test/io/ferguson/readThis/read-write-locale-inner.chpl b/test/io/ferguson/readThis/read-write-locale-inner.chpl
index df3640fe26cc..3fae22da7b72 100644
--- a/test/io/ferguson/readThis/read-write-locale-inner.chpl
+++ b/test/io/ferguson/readThis/read-write-locale-inner.chpl
@@ -1,4 +1,4 @@
-record A {
+record A : writeSerializable {
   var x:int;
   proc serialize(writer, ref serializer) throws {
     var loc = writer.readWriteThisFromLocale();
@@ -6,7 +6,7 @@ record A {
     writer.write(x);
   }
 }
-record B {
+record B : writeSerializable {
   var a:A;
   proc serialize(writer, ref serializer) throws {
     var loc = writer.readWriteThisFromLocale();
diff --git a/test/io/ferguson/readThis/read-write-locale-on.chpl b/test/io/ferguson/readThis/read-write-locale-on.chpl
index c26378e5f140..259c994df633 100644
--- a/test/io/ferguson/readThis/read-write-locale-on.chpl
+++ b/test/io/ferguson/readThis/read-write-locale-on.chpl
@@ -1,4 +1,4 @@
-record A {
+record A : writeSerializable {
   var x:int;
   proc serialize(writer, ref serializer) throws {
     var loc = writer.readWriteThisFromLocale();
@@ -6,7 +6,7 @@ record A {
     writer.writeln(x);
   }
 }
-record B {
+record B : writeSerializable {
   var a:A;
   proc serialize(writer, ref serializer) throws {
     var loc = writer.readWriteThisFromLocale();
diff --git a/test/io/ferguson/readThis/readclass.chpl b/test/io/ferguson/readThis/readclass.chpl
index 5bdebf76fa15..bc3b019f0d96 100644
--- a/test/io/ferguson/readThis/readclass.chpl
+++ b/test/io/ferguson/readThis/readclass.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class mything {
+class mything : serializable {
   var x:int;
   proc init(x: int = 0) { this.x = x; }
   proc init(reader: fileReader(?), ref deserializer) {
@@ -16,7 +16,7 @@ class mything {
   }
 }
 
-class subthing : mything {
+class subthing : mything, serializable {
   var y:int;
   proc init(x: int = 0, y: int = 0) {
     super.init(x);
diff --git a/test/io/ferguson/readThis/readclass2.chpl b/test/io/ferguson/readThis/readclass2.chpl
index ab2d4d706831..59f354660aab 100644
--- a/test/io/ferguson/readThis/readclass2.chpl
+++ b/test/io/ferguson/readThis/readclass2.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class mything {
+class mything : serializable {
   var x:int;
   var y:int;
 
diff --git a/test/io/ferguson/readThis/readclass3.chpl b/test/io/ferguson/readThis/readclass3.chpl
index 743b11aca75d..20c2c9ee85d7 100644
--- a/test/io/ferguson/readThis/readclass3.chpl
+++ b/test/io/ferguson/readThis/readclass3.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class mything {
+class mything : serializable {
   var x:int;
   var y:int;
   proc init(x: int = 0, y: int = 0) {
diff --git a/test/io/ferguson/readThis/readclass4.chpl b/test/io/ferguson/readThis/readclass4.chpl
index 60dbf22374a1..eb3384155d76 100644
--- a/test/io/ferguson/readThis/readclass4.chpl
+++ b/test/io/ferguson/readThis/readclass4.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class mything {
+class mything : writeSerializable {
   var x:int;
   var y:int;
   override proc serialize(writer, ref serializer) throws {
diff --git a/test/io/ferguson/readThis/readclass5.chpl b/test/io/ferguson/readThis/readclass5.chpl
index f7d2beebbdb9..026c4786a004 100644
--- a/test/io/ferguson/readThis/readclass5.chpl
+++ b/test/io/ferguson/readThis/readclass5.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-class mything {
+class mything : serializable {
   var x:int;
   var y:int;
   proc init(x: int = 0, y: int = 0) {
diff --git a/test/io/ferguson/recordeof.chpl b/test/io/ferguson/recordeof.chpl
index d12d07a13e24..2aec0db4e83d 100644
--- a/test/io/ferguson/recordeof.chpl
+++ b/test/io/ferguson/recordeof.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-record MyRecord {
+record MyRecord : serializable {
   var i: int;
   proc init(i: int = 0) { this.i = i; }
   proc init(reader, ref deserializer) throws {
diff --git a/test/io/recordio.chpl b/test/io/recordio.chpl
index 4585e918f5d6..b900470a3811 100644
--- a/test/io/recordio.chpl
+++ b/test/io/recordio.chpl
@@ -8,7 +8,7 @@
  */
 use IO;
 
-record MyRecord {
+record MyRecord : writeSerializable, readDeserializable {
   var i: int;
   var r: real;
   var s: string;
diff --git a/test/io/serializers/basic-types.big.good b/test/io/serializers/basic-types.big.good
index 822e8a907556..b2265ec4ba9f 100644
--- a/test/io/serializers/basic-types.big.good
+++ b/test/io/serializers/basic-types.big.good
@@ -83,6 +83,68 @@ red
 SUCCESS
 ==================
 
+===== range(int(64),both,one) =====
+===== writing: =====
+1..10
+--------------------
+05312e2e3130
+====================
+--- read: ---
+1..10
+-------------
+SUCCESS
+===================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..10 by 2
+--------------------
+0a312e2e31302062792032
+====================
+--- read: ---
+1..10 by 2
+-------------
+SUCCESS
+========================================
+
+===== range(int(64),both,negOne) =====
+===== writing: =====
+1..10 by -1
+--------------------
+0b312e2e3130206279202d31
+====================
+--- read: ---
+1..10 by -1
+-------------
+SUCCESS
+======================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..20 by 3 align 2
+--------------------
+12312e2e3230206279203320616c69676e2032
+====================
+--- read: ---
+1..20 by 3 align 2
+-------------
+SUCCESS
+========================================
+
+===== domain(2,int(64),one) =====
+===== writing: =====
+{1..10, 1..10}
+--------------------
+000000000000000205312e2e313005312e2e3130
+====================
+
+===== domain(2,int(64),positive) =====
+===== writing: =====
+{1..10 by 2, 1..10 by 2}
+--------------------
+00000000000000020a312e2e313020627920320a312e2e31302062792032
+====================
+
 ===== SimpleRecord =====
 ===== writing: =====
 (x = 5, y = 42.0)
diff --git a/test/io/serializers/basic-types.chpl b/test/io/serializers/basic-types.chpl
index 46daf76fb5f1..07b170926184 100644
--- a/test/io/serializers/basic-types.chpl
+++ b/test/io/serializers/basic-types.chpl
@@ -25,6 +25,10 @@ proc test(val, type T = val.type) {
 
       f.writer().withSerializer(FormatWriter).write(val);
     }
+
+    // Avoid bug when reading domains for now.
+    if isDomainType(T) then return;
+
     {
       var readVal = f.reader().withDeserializer(FormatReader).read(T);
       writeln("--- read: ---");
@@ -60,7 +64,7 @@ record SimpleRecord {
   var y : real;
 }
 
-record CustomizedRecord {
+record CustomizedRecord : writeSerializable, initDeserializable {
   var x : int;
   var y : real;
 
@@ -158,6 +162,12 @@ proc main() {
   test((1, 2, 3));
   test((1, 42.0, false));
   test(colors.red);
+  test(1..10);
+  test(1..10 by 2);
+  test(1..10 by -1);
+  test(1..20 by 3 align 2);
+  test({1..10, 1..10});
+  test({1..10, 1..10} by 2);
   test(new SimpleRecord(5, 42.0));
   test(new CustomizedRecord(7, 3.14));
   test(new GenericRecord(int, 3, 42, (1,2,3)));
diff --git a/test/io/serializers/basic-types.default.good b/test/io/serializers/basic-types.default.good
index e04612e941d2..435ace63bd1c 100644
--- a/test/io/serializers/basic-types.default.good
+++ b/test/io/serializers/basic-types.default.good
@@ -83,6 +83,68 @@ red
 SUCCESS
 ==================
 
+===== range(int(64),both,one) =====
+===== writing: =====
+1..10
+--------------------
+1..10
+====================
+--- read: ---
+1..10
+-------------
+SUCCESS
+===================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..10 by 2
+--------------------
+1..10 by 2
+====================
+--- read: ---
+1..10 by 2
+-------------
+SUCCESS
+========================================
+
+===== range(int(64),both,negOne) =====
+===== writing: =====
+1..10 by -1
+--------------------
+1..10 by -1
+====================
+--- read: ---
+1..10 by -1
+-------------
+SUCCESS
+======================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..20 by 3 align 2
+--------------------
+1..20 by 3 align 2
+====================
+--- read: ---
+1..20 by 3 align 2
+-------------
+SUCCESS
+========================================
+
+===== domain(2,int(64),one) =====
+===== writing: =====
+{1..10, 1..10}
+--------------------
+{1..10, 1..10}
+====================
+
+===== domain(2,int(64),positive) =====
+===== writing: =====
+{1..10 by 2, 1..10 by 2}
+--------------------
+{1..10 by 2, 1..10 by 2}
+====================
+
 ===== SimpleRecord =====
 ===== writing: =====
 (x = 5, y = 42.0)
diff --git a/test/io/serializers/basic-types.json.good b/test/io/serializers/basic-types.json.good
index 68de4b8499c3..c054bbf6c93e 100644
--- a/test/io/serializers/basic-types.json.good
+++ b/test/io/serializers/basic-types.json.good
@@ -83,6 +83,68 @@ red
 SUCCESS
 ==================
 
+===== range(int(64),both,one) =====
+===== writing: =====
+1..10
+--------------------
+"1..10"
+====================
+--- read: ---
+1..10
+-------------
+SUCCESS
+===================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..10 by 2
+--------------------
+"1..10 by 2"
+====================
+--- read: ---
+1..10 by 2
+-------------
+SUCCESS
+========================================
+
+===== range(int(64),both,negOne) =====
+===== writing: =====
+1..10 by -1
+--------------------
+"1..10 by -1"
+====================
+--- read: ---
+1..10 by -1
+-------------
+SUCCESS
+======================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..20 by 3 align 2
+--------------------
+"1..20 by 3 align 2"
+====================
+--- read: ---
+1..20 by 3 align 2
+-------------
+SUCCESS
+========================================
+
+===== domain(2,int(64),one) =====
+===== writing: =====
+{1..10, 1..10}
+--------------------
+["1..10", "1..10"]
+====================
+
+===== domain(2,int(64),positive) =====
+===== writing: =====
+{1..10 by 2, 1..10 by 2}
+--------------------
+["1..10 by 2", "1..10 by 2"]
+====================
+
 ===== SimpleRecord =====
 ===== writing: =====
 (x = 5, y = 42.0)
diff --git a/test/io/serializers/basic-types.little.good b/test/io/serializers/basic-types.little.good
index eacae94a9b26..76ff92876f53 100644
--- a/test/io/serializers/basic-types.little.good
+++ b/test/io/serializers/basic-types.little.good
@@ -83,6 +83,68 @@ red
 SUCCESS
 ==================
 
+===== range(int(64),both,one) =====
+===== writing: =====
+1..10
+--------------------
+05312e2e3130
+====================
+--- read: ---
+1..10
+-------------
+SUCCESS
+===================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..10 by 2
+--------------------
+0a312e2e31302062792032
+====================
+--- read: ---
+1..10 by 2
+-------------
+SUCCESS
+========================================
+
+===== range(int(64),both,negOne) =====
+===== writing: =====
+1..10 by -1
+--------------------
+0b312e2e3130206279202d31
+====================
+--- read: ---
+1..10 by -1
+-------------
+SUCCESS
+======================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..20 by 3 align 2
+--------------------
+12312e2e3230206279203320616c69676e2032
+====================
+--- read: ---
+1..20 by 3 align 2
+-------------
+SUCCESS
+========================================
+
+===== domain(2,int(64),one) =====
+===== writing: =====
+{1..10, 1..10}
+--------------------
+020000000000000005312e2e313005312e2e3130
+====================
+
+===== domain(2,int(64),positive) =====
+===== writing: =====
+{1..10 by 2, 1..10 by 2}
+--------------------
+02000000000000000a312e2e313020627920320a312e2e31302062792032
+====================
+
 ===== SimpleRecord =====
 ===== writing: =====
 (x = 5, y = 42.0)
diff --git a/test/io/serializers/basic-types.syntax.good b/test/io/serializers/basic-types.syntax.good
index 9be3f88e027c..f8d9824d732f 100644
--- a/test/io/serializers/basic-types.syntax.good
+++ b/test/io/serializers/basic-types.syntax.good
@@ -83,6 +83,68 @@ red
 SUCCESS
 ==================
 
+===== range(int(64),both,one) =====
+===== writing: =====
+1..10
+--------------------
+"1..10"
+====================
+--- read: ---
+1..10
+-------------
+SUCCESS
+===================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..10 by 2
+--------------------
+"1..10 by 2"
+====================
+--- read: ---
+1..10 by 2
+-------------
+SUCCESS
+========================================
+
+===== range(int(64),both,negOne) =====
+===== writing: =====
+1..10 by -1
+--------------------
+"1..10 by -1"
+====================
+--- read: ---
+1..10 by -1
+-------------
+SUCCESS
+======================================
+
+===== range(int(64),both,positive) =====
+===== writing: =====
+1..20 by 3 align 2
+--------------------
+"1..20 by 3 align 2"
+====================
+--- read: ---
+1..20 by 3 align 2
+-------------
+SUCCESS
+========================================
+
+===== domain(2,int(64),one) =====
+===== writing: =====
+{1..10, 1..10}
+--------------------
+["1..10", "1..10"]
+====================
+
+===== domain(2,int(64),positive) =====
+===== writing: =====
+{1..10 by 2, 1..10 by 2}
+--------------------
+["1..10 by 2", "1..10 by 2"]
+====================
+
 ===== SimpleRecord =====
 ===== writing: =====
 (x = 5, y = 42.0)
diff --git a/test/io/serializers/deserialize-by-ref.chpl b/test/io/serializers/deserialize-by-ref.chpl
index f098d6966bbe..ff4f9f57eac3 100644
--- a/test/io/serializers/deserialize-by-ref.chpl
+++ b/test/io/serializers/deserialize-by-ref.chpl
@@ -1,7 +1,7 @@
 
 use IO, List, Map, FormatHelper, Types;
 
-record A {
+record A : serializable {
   var x: int;
   var b: B;
 
@@ -39,7 +39,7 @@ record A {
   }
 }
 
-record B {
+record B : serializable {
   var t: (int, real);
 
   proc serialize(writer, ref serializer) throws {
@@ -71,7 +71,7 @@ record B {
   }
 }
 
-record myList {
+record myList : serializable {
   var values: list(A);
 
   proc ref deserialize(reader: fileReader(?), ref deserializer: reader.deserializerType) {
@@ -103,7 +103,7 @@ record myList {
     writer.write(values);
 }
 
-record myMap {
+record myMap : serializable {
   var values: map(int, A);
 
   proc ref deserialize(reader: fileReader(?), ref deserializer: reader.deserializerType) {
diff --git a/test/io/serializers/deserialize-from.chpl b/test/io/serializers/deserialize-from.chpl
index e9d89de3906e..d3bb88278ff5 100644
--- a/test/io/serializers/deserialize-from.chpl
+++ b/test/io/serializers/deserialize-from.chpl
@@ -1,7 +1,7 @@
 
 use IO;
 
-record R {
+record R : writeSerializable {
   var x : int;
 
   proc serialize(writer: fileWriter(?), ref serializer) {
@@ -13,7 +13,7 @@ record R {
   }
 }
 
-record G {
+record G : writeSerializable {
   var x;
 
   proc serialize(writer: fileWriter(?), ref serializer) {
@@ -26,7 +26,7 @@ record G {
   }
 }
 
-class C {
+class C : writeSerializable {
   var x : int;
 
   override proc serialize(writer: fileWriter(?), ref serializer) {
diff --git a/test/io/serializers/inflexible-types.bad b/test/io/serializers/inflexible-types.bad
index 5fb4f3cd5efe..25530f90028b 100644
--- a/test/io/serializers/inflexible-types.bad
+++ b/test/io/serializers/inflexible-types.bad
@@ -1,13 +1,13 @@
 ===== writing: =====
 1..5
 --------------------
-1..5
+"1..5"
 ====================
 SUCCESS: range(int(64),both,one)
 ===== writing: =====
 {1..10, 1..10}
 --------------------
-{1..10, 1..10}
+["1..10", "1..10"]
 ====================
 SUCCESS: domain(2,int(64),one)
 ===== writing: =====
diff --git a/test/io/serializers/iter-record.chpl b/test/io/serializers/iter-record.chpl
new file mode 100644
index 000000000000..d0e041f2f6ef
--- /dev/null
+++ b/test/io/serializers/iter-record.chpl
@@ -0,0 +1,11 @@
+
+use IO;
+use FormatHelper;
+
+proc helper(things) {
+  stdout.withSerializer(FormatWriter).writeln(things);
+}
+
+proc main() {
+  helper(for i in 1..10 do i);
+}
diff --git a/test/io/serializers/iter-record.compopts b/test/io/serializers/iter-record.compopts
new file mode 100644
index 000000000000..ce68e4029353
--- /dev/null
+++ b/test/io/serializers/iter-record.compopts
@@ -0,0 +1,2 @@
+-sformat=FormatKind.default # iter-record.default.good
+-sformat=FormatKind.json # iter-record.json.good
diff --git a/test/io/serializers/iter-record.default.good b/test/io/serializers/iter-record.default.good
new file mode 100644
index 000000000000..db5114fdefb6
--- /dev/null
+++ b/test/io/serializers/iter-record.default.good
@@ -0,0 +1 @@
+1 2 3 4 5 6 7 8 9 10
diff --git a/test/io/serializers/iter-record.json.good b/test/io/serializers/iter-record.json.good
new file mode 100644
index 000000000000..9063324c6a47
--- /dev/null
+++ b/test/io/serializers/iter-record.json.good
@@ -0,0 +1 @@
+[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
diff --git a/test/io/serializers/partial.chpl b/test/io/serializers/partial.chpl
index 2f4116d29ec0..711bc52ea787 100644
--- a/test/io/serializers/partial.chpl
+++ b/test/io/serializers/partial.chpl
@@ -1,7 +1,7 @@
 
 use IO, Reflection;
 
-enum Variants { A, B, C, D }
+enum Variants { A, B, C, CG, D }
 enum Modes { Write, Read, Init }
 
 config param variant : Variants = Variants.A;
@@ -18,7 +18,7 @@ record A {
 }
 
 // Should disable generation of 'deserialize' and deserializing 'init'
-record B {
+record B : writeSerializable {
   var x : int;
 
   proc serialize(writer, ref serializer) throws {
@@ -27,7 +27,7 @@ record B {
 }
 
 // Should disable generation of 'serialize' and 'deserialize'
-record C {
+record C : initDeserializable {
   var x : int;
 
   proc init(x : int = 0) {
@@ -39,8 +39,25 @@ record C {
   }
 }
 
+// Should also disable generation of 'serialize' and 'deserialize', but
+// involves generics for completeness.
+record CG : initDeserializable {
+  type T;
+  var x : T;
+
+  proc init(type T, x : T = 0) {
+    this.T = T;
+    this.x = x;
+  }
+  proc init(type T, reader, ref deserializer) {
+    this.T = T;
+    init this;
+    ChapelIO.deserializeDefaultImpl(reader, deserializer, this);
+  }
+}
+
 // Should disable generation of 'serialize' and deserializing 'init'
-record D {
+record D : readDeserializable {
   var x : int;
 
   proc ref deserialize(reader, ref deserializer) throws {
@@ -53,6 +70,7 @@ proc getType() type {
     when Variants.A do return A;
     when Variants.B do return B;
     when Variants.C do return C;
+    when Variants.CG do return CG(int);
     when Variants.D do return D;
     otherwise do return nothing;
   }
diff --git a/test/io/serializers/partial.compopts b/test/io/serializers/partial.compopts
index c429c7d9e492..a4673a5c31fe 100644
--- a/test/io/serializers/partial.compopts
+++ b/test/io/serializers/partial.compopts
@@ -7,6 +7,9 @@
 -svariant=Variants.C -smode=Modes.Write # partial.noser.good
 -svariant=Variants.C -smode=Modes.Read # partial.no-des.good
 -svariant=Variants.C -smode=Modes.Init
+-svariant=Variants.CG -smode=Modes.Write # partial.noser.good
+-svariant=Variants.CG -smode=Modes.Read # partial.no-des.good
+-svariant=Variants.CG -smode=Modes.Init
 -svariant=Variants.D -smode=Modes.Write # partial.noser.good
 -svariant=Variants.D -smode=Modes.Read
 -svariant=Variants.D -smode=Modes.Init # partial.noinit.good
diff --git a/test/io/serializers/readThis-all-value.chpl b/test/io/serializers/readThis-all-value.chpl
index 64f2c5f19c47..e7082da5094d 100644
--- a/test/io/serializers/readThis-all-value.chpl
+++ b/test/io/serializers/readThis-all-value.chpl
@@ -1,7 +1,7 @@
 
 use IO;
 
-record B {
+record B : serializable {
   var x : int;
 
   proc serialize(writer, ref serializer) throws {
diff --git a/test/io/serializers/reader-init.chpl b/test/io/serializers/reader-init.chpl
index 3b31ae65fdaa..438775e71905 100644
--- a/test/io/serializers/reader-init.chpl
+++ b/test/io/serializers/reader-init.chpl
@@ -2,7 +2,7 @@
 use IO;
 use JSON;
 
-record R {
+record R : writeSerializable, initDeserializable {
   var x : int;
   var y : real;
 
@@ -28,7 +28,7 @@ record R {
   }
 }
 
-record G {
+record G : writeSerializable, initDeserializable {
   type A;
   type B;
   var x : A;
@@ -60,7 +60,7 @@ record G {
   }
 }
 
-class Parent {
+class Parent : writeSerializable, initDeserializable {
   var x : int;
 
   proc init(x: int = 0) {
@@ -83,7 +83,7 @@ class Parent {
   }
 }
 
-class Child : Parent {
+class Child : Parent, writeSerializable, initDeserializable {
   var y : real;
 
   proc init(x: int = 0, y: real = 0.0) {
diff --git a/test/io/serializers/unstableWriting.chpl b/test/io/serializers/unstableWriting.chpl
new file mode 100644
index 000000000000..b6b642ec2302
--- /dev/null
+++ b/test/io/serializers/unstableWriting.chpl
@@ -0,0 +1,14 @@
+
+use IO;
+use JSON;
+
+proc helper(thing) {
+  var w = stdout.withSerializer(jsonSerializer);
+  w.writeln(thing);
+}
+
+proc main() {
+  helper(1..10);
+  helper({1..10});
+  helper(for i in 1..10 do i);
+}
diff --git a/test/io/serializers/unstableWriting.compopts b/test/io/serializers/unstableWriting.compopts
new file mode 100644
index 000000000000..398f7a164708
--- /dev/null
+++ b/test/io/serializers/unstableWriting.compopts
@@ -0,0 +1 @@
+--warn-unstable
diff --git a/test/io/serializers/unstableWriting.good b/test/io/serializers/unstableWriting.good
new file mode 100644
index 000000000000..dba51ec4b2f1
--- /dev/null
+++ b/test/io/serializers/unstableWriting.good
@@ -0,0 +1,24 @@
+$CHPL_HOME/modules/standard/JSON.chpl:66: In method 'serializeValue':
+$CHPL_HOME/modules/standard/JSON.chpl:79: warning: Serialization of ranges with non-default Serializer is unstable, and may change in the future
+  $CHPL_HOME/modules/standard/IO.chpl:5921: called as jsonSerializer.serializeValue(writer: fileWriter(false,jsonSerializer), val: range(int(64),both,one)) from method '_serializeOne'
+  $CHPL_HOME/modules/standard/IO.chpl:9102: called as (fileWriter(true,jsonSerializer))._serializeOne(x: range(int(64),both,one), loc: locale) from method 'write'
+  $CHPL_HOME/modules/standard/IO.chpl:9164: called as (fileWriter(true,jsonSerializer)).write(args(0): range(int(64),both,one), args(1): chpl_ioNewline) from method 'writeln'
+  unstableWriting.chpl:7: called as (fileWriter(true,jsonSerializer)).writeln(args(0): range(int(64),both,one)) from function 'helper'
+  unstableWriting.chpl:11: called as helper(thing: range(int(64),both,one))
+$CHPL_HOME/modules/standard/JSON.chpl:66: In method 'serializeValue':
+$CHPL_HOME/modules/standard/JSON.chpl:79: warning: Serialization of rectangular domains with non-default Serializer is unstable, and may change in the future
+  $CHPL_HOME/modules/standard/IO.chpl:5921: called as jsonSerializer.serializeValue(writer: fileWriter(false,jsonSerializer), val: domain(1,int(64),one)) from method '_serializeOne'
+  $CHPL_HOME/modules/standard/IO.chpl:9102: called as (fileWriter(true,jsonSerializer))._serializeOne(x: domain(1,int(64),one), loc: locale) from method 'write'
+  $CHPL_HOME/modules/standard/IO.chpl:9164: called as (fileWriter(true,jsonSerializer)).write(args(0): domain(1,int(64),one), args(1): chpl_ioNewline) from method 'writeln'
+  unstableWriting.chpl:7: called as (fileWriter(true,jsonSerializer)).writeln(args(0): domain(1,int(64),one)) from function 'helper'
+  unstableWriting.chpl:12: called as helper(thing: domain(1,int(64),one))
+$CHPL_HOME/modules/standard/JSON.chpl:66: In method 'serializeValue':
+$CHPL_HOME/modules/standard/JSON.chpl:79: warning: Serialization of iterators with non-default Serializer is unstable, and may change in the future
+  $CHPL_HOME/modules/standard/IO.chpl:5921: called as jsonSerializer.serializeValue(writer: fileWriter(false,jsonSerializer), val: iterator) from method '_serializeOne'
+  $CHPL_HOME/modules/standard/IO.chpl:9102: called as (fileWriter(true,jsonSerializer))._serializeOne(x: iterator, loc: locale) from method 'write'
+  $CHPL_HOME/modules/standard/IO.chpl:9164: called as (fileWriter(true,jsonSerializer)).write(args(0): iterator, args(1): chpl_ioNewline) from method 'writeln'
+  unstableWriting.chpl:7: called as (fileWriter(true,jsonSerializer)).writeln(args(0): iterator) from function 'helper'
+  unstableWriting.chpl:13: called as helper(thing: iterator)
+"1..10"
+["1..10"]
+[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
diff --git a/test/io/serializers/warn-interfaces.chpl b/test/io/serializers/warn-interfaces.chpl
new file mode 100644
index 000000000000..64dd46b61348
--- /dev/null
+++ b/test/io/serializers/warn-interfaces.chpl
@@ -0,0 +1,278 @@
+
+use IO;
+
+record JustTwoRecord : writeSerializable, readDeserializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc ref deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+
+  proc init(x = 0) {
+    this.x = x;
+  }
+
+  proc init(reader, ref deserializer) {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+record SerializableRecord : serializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc ref deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+
+  proc init(x = 0) {
+    this.x = x;
+  }
+
+  proc init(reader, ref deserializer) {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+record DefaultRecord {
+  var x : int;
+}
+
+record SerializeMissingRecord {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+}
+
+record SerializePresentRecord : writeSerializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+}
+
+record DeserializeMissingRecord : writeSerializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc ref deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+}
+
+record DeserializePresentRecord : writeSerializable, readDeserializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc ref deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+}
+
+record InitMissingRecord : writeSerializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc init(x = 0) { this.x = x; }
+
+  proc init(reader, ref deserializer) throws {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+record InitPresentRecord : writeSerializable, initDeserializable {
+  var x : int;
+
+  proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc init(x = 0) { this.x = x; }
+
+  proc init(reader, ref deserializer) throws {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+class JustTwoClass : writeSerializable, readDeserializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  override proc deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+
+  proc init(x = 0) {
+    this.x = x;
+  }
+
+  proc init(reader, ref deserializer) {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+class SerializableClass : serializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  override proc deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+
+  proc init(x = 0) {
+    this.x = x;
+  }
+
+  proc init(reader, ref deserializer) {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+class DefaultClass {
+  var x : int;
+}
+
+class SerializeMissingClass {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+}
+
+class SerializePresentClass : writeSerializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+}
+
+class DeserializeMissingClass : writeSerializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  override proc deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+}
+
+class DeserializePresentClass : writeSerializable, readDeserializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  override proc deserialize(reader, ref deserializer) throws {
+    this.x = reader.read(int);
+  }
+}
+
+class InitMissingClass : writeSerializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc init(x = 0) { this.x = x; }
+
+  proc init(reader, ref deserializer) throws {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+class InitPresentClass : writeSerializable, initDeserializable {
+  var x : int;
+
+  override proc serialize(writer, ref serializer) throws {
+    writer.write(x);
+  }
+
+  proc init(x = 0) { this.x = x; }
+
+  proc init(reader, ref deserializer) throws {
+    init this;
+    this.x = reader.read(int);
+  }
+}
+
+enum mode { no, readVal, readInit }
+use mode;
+
+proc test(type T, param read = mode.readVal) {
+  writeln("----- ", T:string, " -----");
+  var f = openMemFile();
+  var val = new T(10);
+  f.writer().write(val);
+
+  if read == readVal {
+    var newVal = new T();
+    f.reader().read(newVal);
+    writeln("got: ", newVal);
+    const check = if isClassType(T) then newVal! else newVal;
+    assert(check.x == 10);
+  } else if read == readInit {
+    var newVal : T = f.reader().read(T);
+    writeln("got: ", newVal);
+    assert(newVal.x == 10);
+  }
+}
+
+proc main() {
+  test(JustTwoRecord);
+  test(DefaultRecord);
+  test(SerializableRecord);
+  test(SerializeMissingRecord,read=no);
+  test(SerializePresentRecord,read=no);
+  test(DeserializeMissingRecord);
+  test(DeserializePresentRecord);
+  test(InitMissingRecord, read=readInit);
+  test(InitPresentRecord, read=readInit);
+
+  test(owned JustTwoClass);
+  test(owned DefaultClass);
+  test(owned SerializableClass);
+  test(owned SerializeMissingClass,read=no);
+  test(owned SerializePresentClass,read=no);
+  test(owned DeserializeMissingClass);
+  test(owned DeserializePresentClass);
+  test(owned InitMissingClass, read=readInit);
+  test(owned InitPresentClass, read=readInit);
+}
diff --git a/test/io/serializers/warn-interfaces.good b/test/io/serializers/warn-interfaces.good
new file mode 100644
index 000000000000..c2ba738e84a1
--- /dev/null
+++ b/test/io/serializers/warn-interfaces.good
@@ -0,0 +1,48 @@
+warn-interfaces.chpl:nnnn: warning: the type 'JustTwoRecord' defines methods that previously had special meaning. These will soon require 'JustTwoRecord' to implement the 'initDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'init' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'SerializeMissingRecord' defines methods that previously had special meaning. These will soon require 'SerializeMissingRecord' to implement the 'writeSerializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'serialize' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'DeserializeMissingRecord' defines methods that previously had special meaning. These will soon require 'DeserializeMissingRecord' to implement the 'readDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'deserialize' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'InitMissingRecord' defines methods that previously had special meaning. These will soon require 'InitMissingRecord' to implement the 'initDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'init' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'JustTwoClass' defines methods that previously had special meaning. These will soon require 'JustTwoClass' to implement the 'initDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'init' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'SerializeMissingClass' defines methods that previously had special meaning. These will soon require 'SerializeMissingClass' to implement the 'writeSerializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'serialize' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'DeserializeMissingClass' defines methods that previously had special meaning. These will soon require 'DeserializeMissingClass' to implement the 'readDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'deserialize' defined here
+warn-interfaces.chpl:nnnn: warning: the type 'InitMissingClass' defines methods that previously had special meaning. These will soon require 'InitMissingClass' to implement the 'initDeserializable' interface to continue to be treated specially.
+warn-interfaces.chpl:nnnn: note: formerly-special function 'init' defined here
+----- JustTwoRecord -----
+got: 10
+----- DefaultRecord -----
+got: (x = 10)
+----- SerializableRecord -----
+got: 10
+----- SerializeMissingRecord -----
+----- SerializePresentRecord -----
+----- DeserializeMissingRecord -----
+got: 10
+----- DeserializePresentRecord -----
+got: 10
+----- InitMissingRecord -----
+got: 10
+----- InitPresentRecord -----
+got: 10
+----- owned JustTwoClass -----
+got: 10
+----- owned DefaultClass -----
+got: {x = 10}
+----- owned SerializableClass -----
+got: 10
+----- owned SerializeMissingClass -----
+----- owned SerializePresentClass -----
+----- owned DeserializeMissingClass -----
+got: 10
+----- owned DeserializePresentClass -----
+got: 10
+----- owned InitMissingClass -----
+got: 10
+----- owned InitPresentClass -----
+got: 10
diff --git a/test/io/serializers/warn-interfaces.prediff b/test/io/serializers/warn-interfaces.prediff
new file mode 100755
index 000000000000..ac7f45a5574b
--- /dev/null
+++ b/test/io/serializers/warn-interfaces.prediff
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Ignore line numbers in modules.
+
+(head -n 16 $2 | sort -t':' -nk2; tail -n +17 $2) > $2.tmp
+mv $2.tmp $2
+
+sed 's/\.chpl:[0-9]*:/\.chpl:nnnn:/' $2 > $2.tmp
+mv $2.tmp $2
diff --git a/test/io/serializers/write-objects.chpl b/test/io/serializers/write-objects.chpl
index 07707459b03d..86ae50500ae8 100644
--- a/test/io/serializers/write-objects.chpl
+++ b/test/io/serializers/write-objects.chpl
@@ -2,25 +2,25 @@
 use IO;
 use List;
 
-class A {
+class A : writeSerializable {
   override proc serialize(writer: fileWriter(?), ref serializer) throws {
     writer.write("A()");
   }
 }
 
-class B {
+class B : writeSerializable {
   override proc serialize(writer: fileWriter(?), ref serializer) throws {
     writer.write("B()");
   }
 }
 
-class C {
+class C : writeSerializable {
   override proc serialize(writer: fileWriter(?), ref serializer) throws {
     writer.write("C()");
   }
 }
 
-class D : C {
+class D : C, writeSerializable {
   override proc serialize(writer: fileWriter(?), ref serializer) throws {
     writer.write("D()");
   }
diff --git a/test/io/vass/writeThis-on.chpl b/test/io/vass/writeThis-on.chpl
index 8255d0c71dd3..d860e6b2a342 100644
--- a/test/io/vass/writeThis-on.chpl
+++ b/test/io/vass/writeThis-on.chpl
@@ -1,6 +1,6 @@
 // Illustrate the issue by using a customized writeThis method.
 
-class C {
+class C : writeSerializable {
   const home = here.id;
   override proc serialize(writer, ref serializer) throws { writer.write("here=", here.id, " home=", home); }
 }
diff --git a/test/library/draft/DataFrames/DataFrames.chpl b/test/library/draft/DataFrames/DataFrames.chpl
index eeaeba70577f..da4ea6ee9f21 100644
--- a/test/library/draft/DataFrames/DataFrames.chpl
+++ b/test/library/draft/DataFrames/DataFrames.chpl
@@ -22,7 +22,7 @@ module DataFrames {
   use Sort;
   private use IO;
 
-  class Index {
+  class Index : writeSerializable {
     @chpldoc.nodoc
     proc contains(lab): bool {
       halt("generic Index contains no elements");
@@ -86,7 +86,7 @@ module DataFrames {
     }
   }
 
-  class TypedIndex : Index {
+  class TypedIndex : Index, writeSerializable {
     type idxType;
 
     // TODO: implement as binary tree
@@ -398,7 +398,7 @@ module DataFrames {
     }
   }
 
-  class TypedSeries : Series {
+  class TypedSeries : Series, writeSerializable {
     type eltType;
 
     // TODO: ords dmap Block
@@ -746,7 +746,7 @@ module DataFrames {
     }
   }
 
-  class DataFrame {
+  class DataFrame : writeSerializable {
     var labels: domain(string);
 
     // TODO: array of owned Series
diff --git a/test/library/draft/DistributedList/DistributedList.chpl b/test/library/draft/DistributedList/DistributedList.chpl
index 165f205caac3..1032872f28ca 100644
--- a/test/library/draft/DistributedList/DistributedList.chpl
+++ b/test/library/draft/DistributedList/DistributedList.chpl
@@ -49,7 +49,7 @@ module DistributedList {
 
     */
 
-    record distributedList {
+    record distributedList : writeSerializable {
         type eltType;
         param blockSize: int;
 
diff --git a/test/library/draft/DistributedMap/DistributedMap.chpl b/test/library/draft/DistributedMap/DistributedMap.chpl
index aa77875a3947..c140d2dee15e 100644
--- a/test/library/draft/DistributedMap/DistributedMap.chpl
+++ b/test/library/draft/DistributedMap/DistributedMap.chpl
@@ -18,7 +18,7 @@ can be accessed concurrently. Alternatively for intra-locale parallelism
 we can use, for example, ConcurrentMap from the ConcurrentMap package module.
 */
 pragma "always RVF"
-record distributedMap {
+record distributedMap : writeSerializable, readDeserializable {
   type keyType;
   type valType;
   // privatization id
diff --git a/test/library/draft/DistributedMap/v2/DistributedMap.chpl b/test/library/draft/DistributedMap/v2/DistributedMap.chpl
index 7d6726e82b62..593eceb4fa20 100644
--- a/test/library/draft/DistributedMap/v2/DistributedMap.chpl
+++ b/test/library/draft/DistributedMap/v2/DistributedMap.chpl
@@ -28,7 +28,7 @@ module DistributedMap {
   private use Aggregator;
 
   // TODO: document
-  record distributedMap {
+  record distributedMap : serializable {
     type keyType;
     type valType;
     @chpldoc.nodoc
@@ -68,7 +68,7 @@ module DistributedMap {
   }
 
   // TODO: document type, methods
-  class distributedMapImpl {
+  class distributedMapImpl : serializable {
     /* Type of map keys. */
     type keyType;
     /* Type of map values. */
diff --git a/test/library/draft/DistributedMap/v3/DistributedMap.chpl b/test/library/draft/DistributedMap/v3/DistributedMap.chpl
index 4c5eed8618e9..3de05a63a944 100644
--- a/test/library/draft/DistributedMap/v3/DistributedMap.chpl
+++ b/test/library/draft/DistributedMap/v3/DistributedMap.chpl
@@ -10,7 +10,7 @@ module DistributedMap {
     private use ChapelLocks;
 
 
-    record distributedMap {
+    record distributedMap : writeSerializable {
         type keyType;
         type valType;
 
@@ -38,7 +38,7 @@ module DistributedMap {
         }
     }
 
-    class distMapInternal {
+    class distMapInternal : writeSerializable {
         type keyType;
         type valType;
 
diff --git a/test/library/draft/Vector/Vector.chpl b/test/library/draft/Vector/Vector.chpl
index 6b912df7130c..b104abd97e5b 100644
--- a/test/library/draft/Vector/Vector.chpl
+++ b/test/library/draft/Vector/Vector.chpl
@@ -65,7 +65,7 @@ module Vector {
                     "here: ", t:string);
     }
   }
-  record vector {
+  record vector : writeSerializable, readDeserializable {
     /* The type of the elements contained in this vector. */
     type eltType;
     /* If `true`, this vector will perform parallel safe operations. */
diff --git a/test/library/packages/HDF5/htable/HTable.chpl b/test/library/packages/HDF5/htable/HTable.chpl
index 4a0b4412307b..5bdaaba0a813 100644
--- a/test/library/packages/HDF5/htable/HTable.chpl
+++ b/test/library/packages/HDF5/htable/HTable.chpl
@@ -168,7 +168,7 @@ module HTable {
      The `names`, `offsets`, `types` and `sizes` elements are the most
      relevant and may be passed on directly to the HDF5 routines.
   */
-  record H5MetaTable {
+  record H5MetaTable : writeSerializable {
     /* The chplType of the record. */
     type R;
 
diff --git a/test/library/packages/Sort/correctness/keyPartEnding.chpl b/test/library/packages/Sort/correctness/keyPartEnding.chpl
index aadad91c12a3..90bec0dfdd29 100644
--- a/test/library/packages/Sort/correctness/keyPartEnding.chpl
+++ b/test/library/packages/Sort/correctness/keyPartEnding.chpl
@@ -1,7 +1,7 @@
 use Sort;
 use List;
 
-record TwoRepeated {
+record TwoRepeated : writeSerializable {
   var first:int;
   var nFirst:int;
   var second:int;
diff --git a/test/library/packages/Yaml/basic-types.chpl b/test/library/packages/Yaml/basic-types.chpl
index d4444190fcb0..1138fb176b28 100644
--- a/test/library/packages/Yaml/basic-types.chpl
+++ b/test/library/packages/Yaml/basic-types.chpl
@@ -52,7 +52,7 @@ record SimpleRecord {
   var y : real;
 }
 
-record CustomizedRecord {
+record CustomizedRecord : writeSerializable, initDeserializable {
   var x : int;
   var y : real;
 
diff --git a/test/library/packages/Yaml/deserializeByRef.chpl b/test/library/packages/Yaml/deserializeByRef.chpl
index cad65f1b6aa4..380e54acb09a 100644
--- a/test/library/packages/Yaml/deserializeByRef.chpl
+++ b/test/library/packages/Yaml/deserializeByRef.chpl
@@ -1,7 +1,7 @@
 
 use IO, List, Map, FormatHelper;
 
-record A {
+record A : serializable {
   var x: int;
   var b: B;
 
@@ -36,7 +36,7 @@ record A {
   }
 }
 
-record B {
+record B : serializable {
   var t: (int, real);
 
   proc serialize(writer, ref serializer) throws {
@@ -66,7 +66,7 @@ record B {
   }
 }
 
-record myList {
+record myList : serializable {
   var values: list(A);
 
   proc ref deserialize(reader: fileReader(?), ref deserializer: reader.deserializerType) {
@@ -98,7 +98,7 @@ record myList {
     writer.write(values);
 }
 
-record myMap {
+record myMap : serializable {
   var values: map(int, A);
 
   proc ref deserialize(reader: fileReader(?), ref deserializer: reader.deserializerType) {
diff --git a/test/library/standard/BigInteger/nestedOn.compopts b/test/library/standard/BigInteger/nestedOn.compopts
index 931ce292160f..57fe0ed264c4 100644
--- a/test/library/standard/BigInteger/nestedOn.compopts
+++ b/test/library/standard/BigInteger/nestedOn.compopts
@@ -1 +1 @@
---remote-value-forwarding -sbigintInitThrows=true
+--remote-value-forwarding
diff --git a/test/library/standard/IO/formatted/serde_specifier.chpl b/test/library/standard/IO/formatted/serde_specifier.chpl
index 292d0a91ffbb..ff028b23e294 100644
--- a/test/library/standard/IO/formatted/serde_specifier.chpl
+++ b/test/library/standard/IO/formatted/serde_specifier.chpl
@@ -1,6 +1,6 @@
 use IO, IO.FormattedIO;
 
-record R {
+record R : writeSerializable, readDeserializable {
   var x: int;
 
   proc serialize(writer, ref serializer) throws {
diff --git a/test/library/standard/IO/readTo/readUpToType.chpl b/test/library/standard/IO/readTo/readUpToType.chpl
index e7d7c3f0bee8..495fee5f46ab 100644
--- a/test/library/standard/IO/readTo/readUpToType.chpl
+++ b/test/library/standard/IO/readTo/readUpToType.chpl
@@ -1,6 +1,6 @@
 use IO;
 
-record xyType {
+record xyType : serializable {
   var x: int;
   var y: real;
 }
diff --git a/test/library/standard/Map/types/ClassWithMapWithRecord.chpl b/test/library/standard/Map/types/ClassWithMapWithRecord.chpl
index b91fafd879fd..2b9cdb173961 100644
--- a/test/library/standard/Map/types/ClassWithMapWithRecord.chpl
+++ b/test/library/standard/Map/types/ClassWithMapWithRecord.chpl
@@ -49,7 +49,7 @@ use ChapelHashtable;
 // To preserve this future behavior after map updates,
 // a snapshot of `map` was taken at the time of this future
 // creation
-record map {
+record map : writeSerializable {
   type keyType;
   type valType;
 
diff --git a/test/library/standard/MemMove/LowLevelBuffer.chpl b/test/library/standard/MemMove/LowLevelBuffer.chpl
index 309a739860f0..8a59b454b2c5 100644
--- a/test/library/standard/MemMove/LowLevelBuffer.chpl
+++ b/test/library/standard/MemMove/LowLevelBuffer.chpl
@@ -2,7 +2,7 @@
 // Example of a low level buffer that wraps _ddata. See #16797.
 //
 
-record buffer {
+record buffer : writeSerializable {
   type eltType;
 
   // TODO: How to make "on this" equivalent to "on this._data"?
diff --git a/test/modules/diten/returnClassDiffModule5.chpl b/test/modules/diten/returnClassDiffModule5.chpl
index 9088a69995fb..990c71222212 100644
--- a/test/modules/diten/returnClassDiffModule5.chpl
+++ b/test/modules/diten/returnClassDiffModule5.chpl
@@ -3,7 +3,7 @@ module M1 {
   private use IO;
 
   var a = 1;
-  class C {
+  class C : writeSerializable {
     var b = 2;
     proc foo() {
       return a+b;
diff --git a/test/multilocale/bharshbarg/onStmtInIntent.chpl b/test/multilocale/bharshbarg/onStmtInIntent.chpl
index 13e6b24f7e10..dc9d0791c88c 100644
--- a/test/multilocale/bharshbarg/onStmtInIntent.chpl
+++ b/test/multilocale/bharshbarg/onStmtInIntent.chpl
@@ -12,7 +12,7 @@ proc alloc() {
   return ret;
 }
 
-record R {
+record R : writeSerializable {
   var x : c_ptr(int);
   var home : locale;
 
diff --git a/test/multilocale/bradc/needMultiLocales/writeThisUsingOn.chpl b/test/multilocale/bradc/needMultiLocales/writeThisUsingOn.chpl
index a42ce60f838f..db505f94fb04 100644
--- a/test/multilocale/bradc/needMultiLocales/writeThisUsingOn.chpl
+++ b/test/multilocale/bradc/needMultiLocales/writeThisUsingOn.chpl
@@ -1,6 +1,6 @@
 use Time;
 
-class LocC {
+class LocC : writeSerializable {
   var id: int;
   
   override proc serialize(writer, ref serializer) throws {
@@ -10,7 +10,7 @@ class LocC {
   }
 }
 
-class C {
+class C : writeSerializable {
   var locCs: [LocaleSpace] unmanaged LocC?;
 
   proc postinit() {
diff --git a/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass1.chpl b/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass1.chpl
index 924065831429..0fcf5a0f13c1 100644
--- a/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass1.chpl
+++ b/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass1.chpl
@@ -4,7 +4,7 @@ config const verbose: bool = true;
 if n < numLocales || n % numLocales != 0 then
   halt("the number of locales, ", numLocales, ", does not evenly divide n,", n);
 
-class DistributedArray {
+class DistributedArray : writeSerializable {
   var ndata: range(int);
   var data: [ndata] int;
   var others: [0..numLocales-1] unmanaged DistributedArray?;
diff --git a/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass2.chpl b/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass2.chpl
index eb75c1226d41..7f16f95bac14 100644
--- a/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass2.chpl
+++ b/test/multilocale/deitz/needMultiLocales/privateLimitedDistributedArrayClass2.chpl
@@ -4,7 +4,7 @@ config const verbose: bool = true;
 if n < numLocales || n % numLocales != 0 then
   halt("the number of locales, ", numLocales, ", does not evenly divide n,", n);
 
-class DistributedArray {
+class DistributedArray : writeSerializable {
   var ndata: range(int);
   var data: [ndata] int;
   var others: [0..numLocales-1] unmanaged DistributedArray?;
diff --git a/test/multilocale/diten/oneOrMoreLocales/1DBlockDistributedJacobi.chpl b/test/multilocale/diten/oneOrMoreLocales/1DBlockDistributedJacobi.chpl
index 1ee0b0715e56..0d89b142af54 100644
--- a/test/multilocale/diten/oneOrMoreLocales/1DBlockDistributedJacobi.chpl
+++ b/test/multilocale/diten/oneOrMoreLocales/1DBlockDistributedJacobi.chpl
@@ -7,7 +7,7 @@ class DistribArrayNode {
   var arr: [0..size-1] arrType;
 }
 
-class DistribArray {
+class DistribArray : writeSerializable {
   type arrType;
   const arrSize: int;
   const localSize:int = arrSize / numLocales;
diff --git a/test/optimizations/deadCodeElimination/elliot/countDeadModules.good b/test/optimizations/deadCodeElimination/elliot/countDeadModules.good
index 7f8b280a1b4f..d300456308ef 100644
--- a/test/optimizations/deadCodeElimination/elliot/countDeadModules.good
+++ b/test/optimizations/deadCodeElimination/elliot/countDeadModules.good
@@ -1 +1 @@
-Removed 28 dead modules.
+Removed 29 dead modules.
diff --git a/test/parallel/taskPar/sungeun/private.chpl b/test/parallel/taskPar/sungeun/private.chpl
index 7474782cd508..7f4989a291df 100644
--- a/test/parallel/taskPar/sungeun/private.chpl
+++ b/test/parallel/taskPar/sungeun/private.chpl
@@ -7,7 +7,7 @@
 use BlockDist, PrivateDist;
 use Time;
 
-record taskPrivateData {
+record taskPrivateData : writeSerializable {
   var tid: sync chpl_taskID_t = chpl_nullTaskID;
   var x: int;
   var y: [0..#numLocales] real;
diff --git a/test/release/examples/primers/fileIO.chpl b/test/release/examples/primers/fileIO.chpl
index 0f43bbdb284e..7e2974825886 100644
--- a/test/release/examples/primers/fileIO.chpl
+++ b/test/release/examples/primers/fileIO.chpl
@@ -309,7 +309,7 @@ if example == 0 || example == 6 {
     writeln("This should be a chunk: {", "\n a", "\n b", "\n}");
   }
 
-  record MyThing {
+  record MyThing : writeSerializable {
     proc serialize(writer, ref serializer) throws {
       writer.writeln("This should be a chunk: {");
       writer.writeln(" a");
diff --git a/test/release/examples/primers/iterators.chpl b/test/release/examples/primers/iterators.chpl
index db2ceb9aa946..626eab9bfa4e 100644
--- a/test/release/examples/primers/iterators.chpl
+++ b/test/release/examples/primers/iterators.chpl
@@ -127,7 +127,7 @@ postorder
 // Each yield statement returns a node, or equivalently the subtree
 // rooted at that node.
 //
-class Tree {
+class Tree : writeSerializable {
   var data: string;
   var left, right: owned Tree?;
 }
diff --git a/test/release/examples/primers/procedures.chpl b/test/release/examples/primers/procedures.chpl
index 8352b90ae2f3..927351f75a08 100644
--- a/test/release/examples/primers/procedures.chpl
+++ b/test/release/examples/primers/procedures.chpl
@@ -82,7 +82,7 @@ writeln();
 // we define a new type, ``Point``, and overload the definition of ``+``
 // to handle that type.
 //
-record Point { var x, y: real; }
+record Point : writeSerializable { var x, y: real; }
 
 // Tell how to add two points together.
 operator Point.+(p1: Point, p2: Point)
diff --git a/test/release/examples/primers/specialMethods.chpl b/test/release/examples/primers/specialMethods.chpl
index ef2fa7d17f07..0320b60fd6e8 100644
--- a/test/release/examples/primers/specialMethods.chpl
+++ b/test/release/examples/primers/specialMethods.chpl
@@ -38,7 +38,7 @@ proc ExampleRecord2.secondaryMethod() { }
 // the corresponding interface. For the ``hash`` method we'll see below, the
 // appropriate interface is ``hashable``. We can mark ``R`` as implementing
 // ``hashable`` by including a ``: hashable`` after its name when we declare it.
-record R : hashable {
+record R : hashable, writeSerializable, readDeserializable {
   param size: int = 10;
   var vals: size*int;
 }
diff --git a/test/separate_compilation/serialization/testGenLib.MyMod.good b/test/separate_compilation/serialization/testGenLib.MyMod.good
index e3f6cd4db810..48d7a3d852df 100644
--- a/test/separate_compilation/serialization/testGenLib.MyMod.good
+++ b/test/separate_compilation/serialization/testGenLib.MyMod.good
@@ -29,6 +29,7 @@
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
+2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
diff --git a/test/separate_compilation/serialization/testGenLib.OtherMod.good b/test/separate_compilation/serialization/testGenLib.OtherMod.good
index 9ef6d7937a36..ed61937cc9d4 100644
--- a/test/separate_compilation/serialization/testGenLib.OtherMod.good
+++ b/test/separate_compilation/serialization/testGenLib.OtherMod.good
@@ -29,6 +29,7 @@
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
+2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
diff --git a/test/separate_compilation/serialization/testGenLib.both.good b/test/separate_compilation/serialization/testGenLib.both.good
index 714777c07bbc..cc06a3a61de1 100644
--- a/test/separate_compilation/serialization/testGenLib.both.good
+++ b/test/separate_compilation/serialization/testGenLib.both.good
@@ -29,6 +29,7 @@
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
+2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
 2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
diff --git a/test/studies/590o/alaska/graph.chpl b/test/studies/590o/alaska/graph.chpl
index d82b5ae35669..806680aa9654 100644
--- a/test/studies/590o/alaska/graph.chpl
+++ b/test/studies/590o/alaska/graph.chpl
@@ -14,7 +14,7 @@ class position{
   var y: int;
 }
 
-class Node {
+class Node : writeSerializable {
   var id: int;
   var name: string;
   var pos: unmanaged position = new unmanaged position(-1,-1);
@@ -43,7 +43,7 @@ operator Node.<(x: borrowed Node?, y: borrowed Node?) {
   return x!.name < y!.name;
 }
 
-class Edge {
+class Edge : writeSerializable {
   var id: int;
   var src: unmanaged Node;
   var dst: unmanaged Node;
@@ -145,7 +145,7 @@ proc Edge.read(infile: file){
 }
 */
 
-class UndirectedEdge : Edge {
+class UndirectedEdge : Edge, writeSerializable {
   override proc serialize(writer, ref serializer){
      writer.write(src," -- ",dst);
   }
diff --git a/test/studies/amr/lib/level/Level_def.chpl b/test/studies/amr/lib/level/Level_def.chpl
index 92b8caee17a7..66bb3951ae96 100644
--- a/test/studies/amr/lib/level/Level_def.chpl
+++ b/test/studies/amr/lib/level/Level_def.chpl
@@ -22,7 +22,7 @@ private use IO;
 // cells that will be used by each Grid.
 //-------------------------------------------------------------------
 
-class Level {
+class Level : writeSerializable {
 
   var is_complete: bool = false;
   
diff --git a/test/studies/bale/toposort/toposort.chpl b/test/studies/bale/toposort/toposort.chpl
index ff8b9719ed77..70c3e8d9898a 100644
--- a/test/studies/bale/toposort/toposort.chpl
+++ b/test/studies/bale/toposort/toposort.chpl
@@ -394,7 +394,7 @@ class LocalDistributedWorkQueue {
   }
 }
 
-class PermutationMap {
+class PermutationMap : writeSerializable {
   type idxType;
   param rank = 2;
   var rowDom : domain(1);
diff --git a/test/studies/champs/functions.bash b/test/studies/champs/functions.bash
index a0ebcc61aca9..d1be0155c57b 100644
--- a/test/studies/champs/functions.bash
+++ b/test/studies/champs/functions.bash
@@ -87,7 +87,7 @@ function test_run() {
   local nl=$2
 
   test_start "run $kind"
-  $CHPL_HOME/util/test/chpl_launchcmd.py ./bin/champs_${CHAMPS_VERSION}_$kind -nl $nl -f $CHAMPS_CFG_PATH/$kind.in 2>&1 >$kind.exec.out.tmp
+  $CHPL_TEST_LAUNCHCMD ./bin/champs_${CHAMPS_VERSION}_$kind -nl $nl -f $CHAMPS_CFG_PATH/$kind.in 2>&1 >$kind.exec.out.tmp
 
   local status=$?
   cat $kind.exec.out.tmp
diff --git a/test/studies/comd/elegant/arrayOfStructs/util/AccumStencilDist.chpl b/test/studies/comd/elegant/arrayOfStructs/util/AccumStencilDist.chpl
index e8b93a565cb9..e8cc0caa167a 100644
--- a/test/studies/comd/elegant/arrayOfStructs/util/AccumStencilDist.chpl
+++ b/test/studies/comd/elegant/arrayOfStructs/util/AccumStencilDist.chpl
@@ -46,7 +46,7 @@ config param debugAccumStencilDistBulkTransfer = false;
 //
 config param disableAccumStencilLazyRAD = defaultDisableLazyRADOpt;
 
-class AccumStencil : BaseDist {
+class AccumStencil : BaseDist, writeSerializable {
   param rank: int;
   type idxType = int;
   param ignoreFluff: bool;
diff --git a/test/studies/hpcc/common/bradc/BradsBlock1D.chpl b/test/studies/hpcc/common/bradc/BradsBlock1D.chpl
index 245c02e85ede..5b1b604c5a67 100644
--- a/test/studies/hpcc/common/bradc/BradsBlock1D.chpl
+++ b/test/studies/hpcc/common/bradc/BradsBlock1D.chpl
@@ -158,7 +158,7 @@ class LocBlock1DDist {
 //
 // The global domain class
 //
-class Block1DDom {
+class Block1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -245,7 +245,7 @@ class Block1DDom {
 //
 // the local domain class
 //
-class LocBlock1DDom {
+class LocBlock1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -300,7 +300,7 @@ class LocBlock1DDom {
 //
 // the global array class
 //
-class Block1DArr {
+class Block1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -404,7 +404,7 @@ class Block1DArr {
 //
 // the local array class
 //
-class LocBlock1DArr {
+class LocBlock1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
diff --git a/test/studies/hpcc/common/bradc/BradsBlock1DPar-deitzditen.chpl b/test/studies/hpcc/common/bradc/BradsBlock1DPar-deitzditen.chpl
index b64b99f47e29..67d5d1abb705 100644
--- a/test/studies/hpcc/common/bradc/BradsBlock1DPar-deitzditen.chpl
+++ b/test/studies/hpcc/common/bradc/BradsBlock1DPar-deitzditen.chpl
@@ -148,7 +148,7 @@ class LocBlock1DDist {
 //
 // The global domain class
 //
-class Block1DDom {
+class Block1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -280,7 +280,7 @@ class Block1DDom {
 //
 // the local domain class
 //
-class LocBlock1DDom {
+class LocBlock1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -354,7 +354,7 @@ class LocBlock1DDom {
 //
 // the global array class
 //
-class Block1DArr {
+class Block1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -475,7 +475,7 @@ class Block1DArr {
 //
 // the local array class
 //
-class LocBlock1DArr {
+class LocBlock1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
diff --git a/test/studies/hpcc/common/bradc/BradsBlock1DPar-ideal.chpl b/test/studies/hpcc/common/bradc/BradsBlock1DPar-ideal.chpl
index 449221ad1e8c..7253914cac90 100644
--- a/test/studies/hpcc/common/bradc/BradsBlock1DPar-ideal.chpl
+++ b/test/studies/hpcc/common/bradc/BradsBlock1DPar-ideal.chpl
@@ -14,7 +14,7 @@ enum IteratorType { leader, follower };
 //
 // The distribution class
 //
-class Block1DDist {
+class Block1DDist : writeSerializable {
   //
   // The distribution's index type and domain's global index type
   //
@@ -165,7 +165,7 @@ class Block1DDist {
 //
 // A per-locale local distribution class
 //
-class LocBlock1DDist {
+class LocBlock1DDist : writeSerializable {
   // 
   // The distribution's index type and domain's global index type
   //
@@ -220,7 +220,7 @@ class LocBlock1DDist {
 //
 // The global domain class
 //
-class Block1DDom {
+class Block1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -358,7 +358,7 @@ class Block1DDom {
 //
 // the local domain class
 //
-class LocBlock1DDom {
+class LocBlock1DDom : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -432,7 +432,7 @@ class LocBlock1DDom {
 //
 // the global array class
 //
-class Block1DArr {
+class Block1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
@@ -542,7 +542,7 @@ class Block1DArr {
 //
 // the local array class
 //
-class LocBlock1DArr {
+class LocBlock1DArr : writeSerializable {
   //
   // The index types of the global and local domain portions
   //
diff --git a/test/studies/hpcc/common/bradc/BradsBlock1DPar.chpl b/test/studies/hpcc/common/bradc/BradsBlock1DPar.chpl
index 7526019ee669..cd69e4fef80f 100644
--- a/test/studies/hpcc/common/bradc/BradsBlock1DPar.chpl
+++ b/test/studies/hpcc/common/bradc/BradsBlock1DPar.chpl
@@ -21,7 +21,7 @@ enum IteratorType { leader, follower };
 //
 // The distribution class
 //
-class Block1DDist {
+class Block1DDist : writeSerializable {
 
   // GENERICS:
 
@@ -158,7 +158,7 @@ class Block1DDist {
 //
 // A per-locale local distribution class
 //
-class LocBlock1DDist {
+class LocBlock1DDist : writeSerializable {
 
   // GENERICS:
 
@@ -243,7 +243,7 @@ class LocBlock1DDist {
 //
 // The global domain class
 //
-class Block1DDom {
+class Block1DDom : writeSerializable {
 
   // GENERICS:
 
@@ -420,7 +420,7 @@ class Block1DDom {
 //
 // the local domain class
 //
-class LocBlock1DDom {
+class LocBlock1DDom : writeSerializable {
 
   // GENERICS:
 
@@ -511,7 +511,7 @@ class LocBlock1DDom {
 //
 // the global array class
 //
-class Block1DArr {
+class Block1DArr : writeSerializable {
 
   // GENERICS:
 
@@ -636,7 +636,7 @@ class Block1DArr {
 //
 // the local array class
 //
-class LocBlock1DArr {
+class LocBlock1DArr : writeSerializable {
 
   // GENERICS:
 
diff --git a/test/studies/nqueens/nqueens-2-par.chpl b/test/studies/nqueens/nqueens-2-par.chpl
index c7be631fba5f..757990b5854c 100644
--- a/test/studies/nqueens/nqueens-2-par.chpl
+++ b/test/studies/nqueens/nqueens-2-par.chpl
@@ -100,7 +100,7 @@ proc tryQueenInNextRow(board: unmanaged Board): void {
 //
 // Record-style value copying can be done with Board.clone().
 //
-class Board {
+class Board : writeSerializable {
 
   // size of the board
   const boardSize: int;
diff --git a/test/studies/nqueens/nqueens-2-seq.chpl b/test/studies/nqueens/nqueens-2-seq.chpl
index f99eec7affec..f2d504ba84a5 100644
--- a/test/studies/nqueens/nqueens-2-seq.chpl
+++ b/test/studies/nqueens/nqueens-2-seq.chpl
@@ -79,7 +79,7 @@ proc tryQueenInNextRow(board: unmanaged Board): void {
 // - remove a queen
 //   (queens must be removed in the LIFO order).
 //
-class Board {
+class Board : writeSerializable {
 
   // size of the board
   const boardSize: int;
diff --git a/test/studies/programs/linkedList.chpl b/test/studies/programs/linkedList.chpl
index 76241d3ea08a..c587841aed75 100644
--- a/test/studies/programs/linkedList.chpl
+++ b/test/studies/programs/linkedList.chpl
@@ -15,7 +15,7 @@ config const listSize = 10;  // Used when populating the list
 //
 // A generic linked list class
 //
-class List {
+class List : writeSerializable {
   type eltType;
   var head: unmanaged Node(eltType)?;
 
diff --git a/test/studies/shootout/submitted/pidigits2.notest b/test/studies/shootout/submitted/pidigits2.notest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/studies/shootout/submitted/regexredux2.notest b/test/studies/shootout/submitted/regexredux2.notest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/studies/shootout/submitted/regexredux3.notest b/test/studies/shootout/submitted/regexredux3.notest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/trivial/deitz/demo/sample1.chpl b/test/trivial/deitz/demo/sample1.chpl
index 7e4e046f0741..f541e4be8117 100644
--- a/test/trivial/deitz/demo/sample1.chpl
+++ b/test/trivial/deitz/demo/sample1.chpl
@@ -1,4 +1,4 @@
-class trio {
+class trio : writeSerializable {
   type elt_type;
 
   var x1 : elt_type;
diff --git a/test/trivial/deitz/demo/sample1a.chpl b/test/trivial/deitz/demo/sample1a.chpl
index 589ddc00c6b0..fafc0f150c2e 100644
--- a/test/trivial/deitz/demo/sample1a.chpl
+++ b/test/trivial/deitz/demo/sample1a.chpl
@@ -1,4 +1,4 @@
-class trio {
+class trio : writeSerializable {
   var x1;
   var x2;
   var x3;
diff --git a/test/trivial/deitz/demo/sample1b.chpl b/test/trivial/deitz/demo/sample1b.chpl
index 471f34168312..48f5e0875fcd 100644
--- a/test/trivial/deitz/demo/sample1b.chpl
+++ b/test/trivial/deitz/demo/sample1b.chpl
@@ -1,4 +1,4 @@
-class trio {
+class trio : writeSerializable {
   type elt_type;
 
   var x1 : elt_type;
diff --git a/test/types/records/generic/allParamMultiInst.chpl b/test/types/records/generic/allParamMultiInst.chpl
index d52615eb0f40..bb1ef0c9ee39 100644
--- a/test/types/records/generic/allParamMultiInst.chpl
+++ b/test/types/records/generic/allParamMultiInst.chpl
@@ -1,4 +1,4 @@
-record R {
+record R : writeSerializable {
   param x: int;
   param y: int;
 
@@ -7,7 +7,7 @@ record R {
   }
 }
 
-record S {
+record S : writeSerializable {
   var r: R(?);
   param z: int;
 
diff --git a/test/types/tuple/deitz/recordAsTuple/test_tuple_record_implementation16.chpl b/test/types/tuple/deitz/recordAsTuple/test_tuple_record_implementation16.chpl
index f9053f8c3387..b084288455ac 100644
--- a/test/types/tuple/deitz/recordAsTuple/test_tuple_record_implementation16.chpl
+++ b/test/types/tuple/deitz/recordAsTuple/test_tuple_record_implementation16.chpl
@@ -1,4 +1,4 @@
-record mytuple {
+record mytuple : writeSerializable {
   type t1;
   type t2;
   var f1 : t1;
diff --git a/test/types/tuple/dinan/pining_for_lisp.chpl b/test/types/tuple/dinan/pining_for_lisp.chpl
index c158b64d9393..9ed8bce3b7c3 100644
--- a/test/types/tuple/dinan/pining_for_lisp.chpl
+++ b/test/types/tuple/dinan/pining_for_lisp.chpl
@@ -1,4 +1,4 @@
-class NilClass { }
+class NilClass : writeSerializable { }
 override proc NilClass.serialize(writer, ref serializer) throws { writer.write("nil"); }
 var gNil = new owned NilClass();
 
diff --git a/test/types/tuple/dinan/pining_for_lisp_ver2.chpl b/test/types/tuple/dinan/pining_for_lisp_ver2.chpl
index 7c5bb0d4baee..1c20a93bd774 100644
--- a/test/types/tuple/dinan/pining_for_lisp_ver2.chpl
+++ b/test/types/tuple/dinan/pining_for_lisp_ver2.chpl
@@ -1,4 +1,4 @@
-class NilClass { }
+class NilClass : writeSerializable { }
 override proc NilClass.serialize(writer, ref serializer) throws { writer.write("nil"); }
 var gNil = new owned NilClass();
 
diff --git a/test/types/type_variables/deitz/part2/test_typevar_record3.chpl b/test/types/type_variables/deitz/part2/test_typevar_record3.chpl
index aaf1c9d3af4f..f5f5c8e40c35 100644
--- a/test/types/type_variables/deitz/part2/test_typevar_record3.chpl
+++ b/test/types/type_variables/deitz/part2/test_typevar_record3.chpl
@@ -4,7 +4,7 @@ class node {
   var next : unmanaged node(t)?;
 }
 
-record foo {
+record foo : writeSerializable {
   type t;
 
   var  length : int;
diff --git a/test/types/type_variables/deitz/part2/test_typevar_record4.chpl b/test/types/type_variables/deitz/part2/test_typevar_record4.chpl
index 421269b979c5..1ba249f16c0d 100644
--- a/test/types/type_variables/deitz/part2/test_typevar_record4.chpl
+++ b/test/types/type_variables/deitz/part2/test_typevar_record4.chpl
@@ -4,7 +4,7 @@ class node {
   var next : unmanaged node(t)?;
 }
 
-record foo {
+record foo : writeSerializable {
   type t;
   var length : int;
   var first : unmanaged node(t)?;
diff --git a/test/types/type_variables/deitz/part2/test_typevar_record5.chpl b/test/types/type_variables/deitz/part2/test_typevar_record5.chpl
index b74aee8985b1..41df0d126c77 100644
--- a/test/types/type_variables/deitz/part2/test_typevar_record5.chpl
+++ b/test/types/type_variables/deitz/part2/test_typevar_record5.chpl
@@ -4,7 +4,7 @@ class node {
   var next : unmanaged node(t)?;
 }
 
-record foo {
+record foo : writeSerializable {
   type t;
   var length : int;
   var first : unmanaged node(t)?;
diff --git a/test/types/type_variables/deitz/part2/test_typevar_record6.chpl b/test/types/type_variables/deitz/part2/test_typevar_record6.chpl
index 0ad6d84bfefc..fc7450b8775e 100644
--- a/test/types/type_variables/deitz/part2/test_typevar_record6.chpl
+++ b/test/types/type_variables/deitz/part2/test_typevar_record6.chpl
@@ -4,7 +4,7 @@ class node {
   var next : unmanaged node(t)?;
 }
 
-record foo {
+record foo : writeSerializable {
   type t;
   var length : int;
   var first : unmanaged node(t)?;
diff --git a/test/types/type_variables/deitz/part7/test_stack.chpl b/test/types/type_variables/deitz/part7/test_stack.chpl
index 3791daaf7f8a..0d1f73da64b4 100644
--- a/test/types/type_variables/deitz/part7/test_stack.chpl
+++ b/test/types/type_variables/deitz/part7/test_stack.chpl
@@ -4,7 +4,7 @@ class stack_elt {
   var next : unmanaged stack_elt(eltType)?;
 }
 
-record stack {
+record stack : writeSerializable {
   type eltType;
 
   var  top : unmanaged stack_elt(eltType)?;
diff --git a/test/types/type_variables/ferguson/notGenericQ-var.good b/test/types/type_variables/ferguson/notGenericQ-var.good
index cf2bbb67ec56..3aa05f5cc183 100644
--- a/test/types/type_variables/ferguson/notGenericQ-var.good
+++ b/test/types/type_variables/ferguson/notGenericQ-var.good
@@ -1,3 +1 @@
-notGenericQ-var.chpl:4: error: invalid type specifier 'R(?)'
-notGenericQ-var.chpl:1: note: type 'R' is not generic
-notGenericQ-var.chpl:4: note: did you forget the 'new' keyword?
+notGenericQ-var.chpl:4: error: the variable x is marked generic with (?) but the type 'R' is not generic
diff --git a/test/unstable/packageModules.chpl b/test/unstable/packageModules.chpl
index 162d0278aecb..69fb3c861b53 100644
--- a/test/unstable/packageModules.chpl
+++ b/test/unstable/packageModules.chpl
@@ -30,8 +30,6 @@ import LockFreeStack;
 import MPI;
 import MatrixMarket;
 import NetCDF;
-import OrderedMap;
-import OrderedSet;
 import PeekPoke;
 import Prefetch;
 import ProtobufProtocolSupport;
diff --git a/test/unstable/packageModules.good b/test/unstable/packageModules.good
index 840ccf4d7e9b..03214b5f854f 100644
--- a/test/unstable/packageModules.good
+++ b/test/unstable/packageModules.good
@@ -1,55 +1,53 @@
-packageModules.chpl:1: warning: AllLocalesBarriers is unstable
-packageModules.chpl:2: warning: ArgumentParser is unstable.
-packageModules.chpl:3: warning: AtomicObjects is unstable
-packageModules.chpl:4: warning: BLAS is unstable
-packageModules.chpl:5: warning: BinaryIO module is deprecated; please use the IO module instead
-packageModules.chpl:6: warning: Buffers is unstable
-packageModules.chpl:7: warning: Channel is unstable
-packageModules.chpl:8: warning: ChplFormat module is considered unstable pending naming changes
-packageModules.chpl:9: warning: Collection is unstable
-packageModules.chpl:10: warning: ConcurrentMap is unstable
-packageModules.chpl:11: warning: CopyAggregation is unstable
-packageModules.chpl:12: warning: Crypto is unstable
-packageModules.chpl:13: warning: Curl is unstable
-packageModules.chpl:14: warning: DistributedBag is unstable
-packageModules.chpl:15: warning: DistributedDeque is unstable
-packageModules.chpl:16: warning: DistributedIters is unstable
-packageModules.chpl:17: warning: EpochManager is unstable
-packageModules.chpl:18: warning: ExplicitRefCount is unstable
-packageModules.chpl:19: warning: FFTW is unstable
-packageModules.chpl:20: warning: FunctionalOperations is unstable
-packageModules.chpl:21: warning: Futures is unstable
-packageModules.chpl:22: warning: HDF5 is unstable
-packageModules.chpl:23: warning: HDFS is unstable
-packageModules.chpl:24: warning: LAPACK is unstable
-packageModules.chpl:25: warning: LinearAlgebra is unstable
-packageModules.chpl:26: warning: LinearAlgebraJama is unstable
-packageModules.chpl:27: warning: LinkedLists is unstable
-packageModules.chpl:28: warning: LockFreeQueue is unstable
-packageModules.chpl:29: warning: LockFreeStack is unstable
-packageModules.chpl:30: warning: MPI is unstable
-packageModules.chpl:31: warning: MatrixMarket is unstable
-packageModules.chpl:32: warning: NetCDF is unstable
-packageModules.chpl:33: warning: The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap
-packageModules.chpl:34: warning: The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap
-packageModules.chpl:35: warning: PeekPoke is unstable
-packageModules.chpl:36: warning: Prefetch is unstable
-packageModules.chpl:37: warning: ProtobufProtocolSupport is unstable
-packageModules.chpl:38: warning: RangeChunk is unstable
-packageModules.chpl:39: warning: RecordParser is unstable
-packageModules.chpl:40: warning: ReplicatedVar is unstable
-packageModules.chpl:41: warning: Search is unstable
-packageModules.chpl:42: warning: Socket is unstable
-packageModules.chpl:43: warning: Sort is unstable
-packageModules.chpl:44: warning: SortedMap is unstable
-packageModules.chpl:45: warning: SortedSet is unstable
-packageModules.chpl:46: warning: TOML is unstable
-packageModules.chpl:47: warning: URL is unstable
-packageModules.chpl:48: warning: UgniPerfStats is unstable
-packageModules.chpl:49: warning: UnitTest is unstable
-packageModules.chpl:50: warning: UnorderedAtomics is unstable
-packageModules.chpl:51: warning: UnorderedCopy is unstable
-packageModules.chpl:52: warning: UnrolledLinkedList is unstable
-packageModules.chpl:53: warning: VisualDebug is unstable
-packageModules.chpl:54: warning: The YAML module is considered unstable pending various name and design changes.
-packageModules.chpl:55: warning: ZMQ is unstable
+packageModules.chpl:XX: warning: AllLocalesBarriers is unstable
+packageModules.chpl:XX: warning: ArgumentParser is unstable.
+packageModules.chpl:XX: warning: AtomicObjects is unstable
+packageModules.chpl:XX: warning: BLAS is unstable
+packageModules.chpl:XX: warning: BinaryIO module is deprecated; please use the IO module instead
+packageModules.chpl:XX: warning: Buffers is unstable
+packageModules.chpl:XX: warning: Channel is unstable
+packageModules.chpl:XX: warning: ChplFormat module is considered unstable pending naming changes
+packageModules.chpl:XX: warning: Collection is unstable
+packageModules.chpl:XX: warning: ConcurrentMap is unstable
+packageModules.chpl:XX: warning: CopyAggregation is unstable
+packageModules.chpl:XX: warning: Crypto is unstable
+packageModules.chpl:XX: warning: Curl is unstable
+packageModules.chpl:XX: warning: DistributedBag is unstable
+packageModules.chpl:XX: warning: DistributedDeque is unstable
+packageModules.chpl:XX: warning: DistributedIters is unstable
+packageModules.chpl:XX: warning: EpochManager is unstable
+packageModules.chpl:XX: warning: ExplicitRefCount is unstable
+packageModules.chpl:XX: warning: FFTW is unstable
+packageModules.chpl:XX: warning: FunctionalOperations is unstable
+packageModules.chpl:XX: warning: Futures is unstable
+packageModules.chpl:XX: warning: HDF5 is unstable
+packageModules.chpl:XX: warning: HDFS is unstable
+packageModules.chpl:XX: warning: LAPACK is unstable
+packageModules.chpl:XX: warning: LinearAlgebra is unstable
+packageModules.chpl:XX: warning: LinearAlgebraJama is unstable
+packageModules.chpl:XX: warning: LinkedLists is unstable
+packageModules.chpl:XX: warning: LockFreeQueue is unstable
+packageModules.chpl:XX: warning: LockFreeStack is unstable
+packageModules.chpl:XX: warning: MPI is unstable
+packageModules.chpl:XX: warning: MatrixMarket is unstable
+packageModules.chpl:XX: warning: NetCDF is unstable
+packageModules.chpl:XX: warning: PeekPoke is unstable
+packageModules.chpl:XX: warning: Prefetch is unstable
+packageModules.chpl:XX: warning: ProtobufProtocolSupport is unstable
+packageModules.chpl:XX: warning: RangeChunk is unstable
+packageModules.chpl:XX: warning: RecordParser is unstable
+packageModules.chpl:XX: warning: ReplicatedVar is unstable
+packageModules.chpl:XX: warning: Search is unstable
+packageModules.chpl:XX: warning: Socket is unstable
+packageModules.chpl:XX: warning: Sort is unstable
+packageModules.chpl:XX: warning: SortedMap is unstable
+packageModules.chpl:XX: warning: SortedSet is unstable
+packageModules.chpl:XX: warning: TOML is unstable
+packageModules.chpl:XX: warning: URL is unstable
+packageModules.chpl:XX: warning: UgniPerfStats is unstable
+packageModules.chpl:XX: warning: UnitTest is unstable
+packageModules.chpl:XX: warning: UnorderedAtomics is unstable
+packageModules.chpl:XX: warning: UnorderedCopy is unstable
+packageModules.chpl:XX: warning: UnrolledLinkedList is unstable
+packageModules.chpl:XX: warning: VisualDebug is unstable
+packageModules.chpl:XX: warning: The YAML module is considered unstable pending various name and design changes.
+packageModules.chpl:XX: warning: ZMQ is unstable
diff --git a/test/unstable/packageModules.prediff b/test/unstable/packageModules.prediff
new file mode 100755
index 000000000000..2b5a6de4a213
--- /dev/null
+++ b/test/unstable/packageModules.prediff
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sed "s/packageModules.chpl:[[:digit:]]\+:/packageModules.chpl:XX:/" $2 > $2.prediffed
+mv $2.prediffed $2
diff --git a/test/users/shetag/tensor-workaround.chpl b/test/users/shetag/tensor-workaround.chpl
index 2e3e7e7d7d4f..05c6ff5f5a74 100644
--- a/test/users/shetag/tensor-workaround.chpl
+++ b/test/users/shetag/tensor-workaround.chpl
@@ -14,7 +14,7 @@ version of the 1d example code.
 
 type elemType = real(64);
 
-class Vector {
+class Vector : writeSerializable {
   var n : int;
   var d = {1..n};
   var a : [d] elemType;
diff --git a/test/users/thom/itoverride.chpl b/test/users/thom/itoverride.chpl
index 19f27c53be18..f5f79d755ba5 100644
--- a/test/users/thom/itoverride.chpl
+++ b/test/users/thom/itoverride.chpl
@@ -1,11 +1,11 @@
 use IO;
 
-class C
+class C : writeSerializable
 {
   override proc serialize(writer, ref serializer) throws { writer.write("C"); }
 }
 
-class SubC : C
+class SubC : C, writeSerializable
 {
   override proc serialize(writer, ref serializer) throws { writer.write("SubC"); }
 }
diff --git a/test/users/thom/returnGenericLineno/rosslyn.chpl b/test/users/thom/returnGenericLineno/rosslyn.chpl
index 7c0b50c0f380..c3c4d456c0be 100644
--- a/test/users/thom/returnGenericLineno/rosslyn.chpl
+++ b/test/users/thom/returnGenericLineno/rosslyn.chpl
@@ -52,7 +52,7 @@ module Rosslyn
     }
 
 
-    class BenchmarkFactory
+    class BenchmarkFactory : writeSerializable
     {
         //abstract
         proc getInstance() : unmanaged Benchmark
diff --git a/test/users/thom/returnGenericLineno/strassen.chpl b/test/users/thom/returnGenericLineno/strassen.chpl
index 42a8571c625c..291983915366 100644
--- a/test/users/thom/returnGenericLineno/strassen.chpl
+++ b/test/users/thom/returnGenericLineno/strassen.chpl
@@ -7,7 +7,7 @@ module Strassen
     private use IO;
 
     class StrassenFactory : BenchmarkFactory
-    {
+   , writeSerializable {
         var n : int;
 
         override proc getInstance() : unmanaged Strassen  // Error message line# wrong
@@ -22,7 +22,7 @@ module Strassen
     }
 
     class Strassen : Benchmark
-    {
+   , writeSerializable {
         var n;
         proc serialize(writer, ref serializer) throws
         {
diff --git a/test/variables/declareVariableGenericType.chpl b/test/variables/declareVariableGenericType.chpl
new file mode 100644
index 000000000000..c1c4e2c464bf
--- /dev/null
+++ b/test/variables/declareVariableGenericType.chpl
@@ -0,0 +1,5 @@
+var d1: domain = {1..34};
+writeln(d1);
+
+var d2: domain(?) = {1..34};
+writeln(d2);
diff --git a/test/variables/declareVariableGenericType.good b/test/variables/declareVariableGenericType.good
new file mode 100644
index 000000000000..b5405a9b8e44
--- /dev/null
+++ b/test/variables/declareVariableGenericType.good
@@ -0,0 +1,3 @@
+declareVariableGenericType.chpl:1: warning: please use 'domain(?)' for the type of a generic variable storing any domain
+{1..34}
+{1..34}
diff --git a/util/cron/common-champs.bash b/util/cron/common-champs.bash
index f14c973a557e..cf2046c7c01f 100644
--- a/util/cron/common-champs.bash
+++ b/util/cron/common-champs.bash
@@ -12,14 +12,20 @@ pushd $CHAMPS_COMMON_DIR
 git pull
 popd
 
+echo Enabling Cray PE
 source $CRAY_ENABLE_PE
 
 # All CHAMPS testing is currently on a hpe-apollo
+
+echo Initial list of modules:
 module list
 
-source $CWD/common-hpe-apollo.bash
+module purge
+
 source $CWD/common-perf-hpe-apollo-hdr.bash
 
+module list
+
 module load PrgEnv-gnu
 module load cray-pmi
 module load cray-mpich
@@ -27,6 +33,17 @@ module load cray-hdf5-parallel
 
 module list
 
+# note that this part is similar to common-hpe-apollo.bash, but
+# we don't want the module operations in there, nor we can source it
+# earlier. Because if we source load-chpl-deps.bash early, we can't
+# load PrgEnv-gnu
+export CHPL_HOST_PLATFORM=hpe-apollo
+export CHPL_TEST_LAUNCHCMD=\$CHPL_HOME/util/test/chpl_launchcmd.py
+export CHPL_LAUNCHER_TIMEOUT=pbs
+source $CWD/load-base-deps.bash
+
+module list
+
 # Perf configuration
 source $CWD/common-perf.bash
 CHAMPS_PERF_DIR=${CHAMPS_PERF_DIR:-$COMMON_DIR/NightlyPerformance/champs}