diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala
index 193ee076a..bfdb48293 100644
--- a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala
+++ b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala
@@ -725,19 +725,54 @@ class ProtobufGenerator(
     printer.addWithDelimiter(",")(constructorFields(message).map(_.fullString))
   }
 
+  private def usesBaseTypeInBuilder(field: FieldDescriptor) = field.isRequired || field.noBox
+
   def generateBuilder(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
     val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message)
     val requiredFieldMap: Map[FieldDescriptor, Int] =
       message.fields.filter(_.isRequired).zipWithIndex.toMap
-    case class Field(name: String, typeName: String, default: String, accessor: String)
+    case class Field(
+        name: String,
+        targetName: String,
+        typeName: String,
+        default: String,
+        accessor: String,
+        builder: String
+    )
 
     val fields = message.fieldsWithoutOneofs.map { field =>
-      if (!field.isRepeated)
+      if (usesBaseTypeInBuilder(field)) {
+        // To handle custom types that have no default values, we wrap required/no-boxed messages in
+        // Option during parsing. We also apply the type mapper after parsing is complete.
+        if (field.isMessage)
+          Field(
+            s"__${field.scalaName}",
+            field.scalaName.asSymbol,
+            s"_root_.scala.Option[${field.baseSingleScalaTypeName}]",
+            C.None,
+            s"_root_.scala.Some(${toBaseTypeExpr(field)(s"_message__.${field.scalaName.asSymbol}", EnclosingType.None)})",
+            toCustomTypeExpr(field)(
+              s"__${field.scalaName}.getOrElse(${field.getMessageType.scalaType.fullName}.defaultInstance)",
+              EnclosingType.None
+            )
+          )
+        else
+          Field(
+            s"__${field.scalaName}",
+            field.scalaName.asSymbol,
+            field.baseSingleScalaTypeName,
+            defaultValueForGet(field, uncustomized = true),
+            toBaseTypeExpr(field)(s"_message__.${field.scalaName.asSymbol}", EnclosingType.None),
+            toCustomTypeExpr(field)(s"__${field.scalaName}", EnclosingType.None)
+          )
+      } else if (!field.isRepeated)
         Field(
           s"__${field.scalaName}",
+          field.scalaName.asSymbol,
           field.scalaTypeName,
           defaultValueForDefaultInstance(field),
-          s"_message__.${field.scalaName.asSymbol}"
+          s"_message__.${field.scalaName.asSymbol}",
+          s"__${field.scalaName}"
         )
       else {
         val it =
@@ -746,25 +781,31 @@ class ProtobufGenerator(
           else s"_message__.${field.scalaName.asSymbol}"
         Field(
           s"__${field.scalaName}",
+          field.scalaName.asSymbol,
           s"collection.mutable.Builder[${field.singleScalaTypeName}, ${field.scalaTypeName}]",
           field.collection.newBuilder,
-          s"${field.collection.newBuilder} ++= $it"
+          s"${field.collection.newBuilder} ++= $it",
+          s"__${field.scalaName}.result()"
         )
       }
     } ++ message.getOneofs.asScala.map { oneof =>
       Field(
         s"__${oneof.scalaName.name}",
+        oneof.scalaName.name.asSymbol,
         oneof.scalaType.fullName,
         oneof.empty.fullName,
-        s"_message__.${oneof.scalaName.nameSymbol}"
+        s"_message__.${oneof.scalaName.nameSymbol}",
+        s"__${oneof.scalaName.name}"
       )
     } ++ (if (message.preservesUnknownFields)
             Seq(
               Field(
                 "`_unknownFields__`",
+                "unknownFields",
                 "_root_.scalapb.UnknownFieldSet.Builder",
                 "null",
-                "new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields)"
+                "new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields)",
+                "if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()"
               )
             )
           else Seq.empty)
@@ -800,20 +841,7 @@ class ProtobufGenerator(
               )
             }.add(s"$myFullScalaName(")
               .indented(
-                _.addWithDelimiter(",")(
-                  (message.fieldsWithoutOneofs ++ message.getOneofs.asScala).map {
-                    case e: FieldDescriptor if e.isRepeated =>
-                      s"  ${e.scalaName.asSymbol} = __${e.scalaName}.result()"
-                    case e: FieldDescriptor =>
-                      s"  ${e.scalaName.asSymbol} = __${e.scalaName}"
-                    case e: OneofDescriptor =>
-                      s"  ${e.scalaName.nameSymbol} = __${e.scalaName.name}"
-                  } ++ (if (message.preservesUnknownFields)
-                          Seq(
-                            "  unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()"
-                          )
-                        else Seq())
-                )
+                _.addWithDelimiter(",")(fields.map(e => s"${e.targetName} = ${e.builder}"))
               )
               .add(")")
           )
@@ -856,28 +884,32 @@ class ProtobufGenerator(
       .print(message.fields) { (printer, field) =>
         val p = {
           val newValBase = if (field.isMessage) {
-            val defInstance =
-              s"${field.getMessageType.scalaType.fullNameWithMaybeRoot(message)}.defaultInstance"
-            val baseInstance =
-              if (field.isRepeated) defInstance
-              else {
+            // In 0.10.x we can't simply call any of the new methods that relies on Builder,
+            // since the references message may have been generated using an older version of
+            // ScalaPB.
+            val baseName = field.baseSingleScalaTypeName
+            val read =
+              if (field.isRepeated) s"_root_.scalapb.LiteParser.readMessage[$baseName](_input__)"
+              else if (usesBaseTypeInBuilder(field)) {
+                s"_root_.scala.Some(__${field.scalaName}.fold(_root_.scalapb.LiteParser.readMessage[$baseName](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))"
+              } else {
                 val expr =
                   if (field.isInOneof)
                     s"__${fieldAccessorSymbol(field)}"
                   else s"__${field.scalaName}"
-                val mappedType =
-                  toBaseFieldType(field).apply(expr, field.enclosingType)
+                val mappedType = toBaseFieldType(field).apply(expr, field.enclosingType)
                 if (field.isInOneof || field.supportsPresence)
-                  (mappedType + s".getOrElse($defInstance)")
-                else mappedType
+                  s"$mappedType.fold(_root_.scalapb.LiteParser.readMessage[$baseName](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))"
+                else s"_root_.scalapb.LiteParser.readMessage[$baseName](_input__, $mappedType)"
               }
-            s"_root_.scalapb.LiteParser.readMessage(_input__, $baseInstance)"
+            read
           } else if (field.isEnum)
             s"${field.getEnumType.scalaType.fullNameWithMaybeRoot(message)}.fromValue(_input__.readEnum())"
           else if (field.getType == Type.STRING) s"_input__.readStringRequireUtf8()"
           else s"_input__.read${Types.capitalizedType(field.getType)}()"
 
-          val newVal = toCustomType(field)(newValBase)
+          val newVal =
+            if (!usesBaseTypeInBuilder(field)) toCustomType(field)(newValBase) else newValBase
 
           val updateOp =
             if (field.supportsPresence) s"__${field.scalaName} = Option($newVal)"
@@ -1425,6 +1457,9 @@ class ProtobufGenerator(
       .add(s"""object $className extends $companionType {
               |  implicit def messageCompanion: $companionType = this""".stripMargin)
       .indent
+      .add(
+        s"override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): ${message.scalaType.fullName} = newBuilder.merge(input).result"
+      )
       .when(message.javaConversions)(generateToJavaProto(message))
       .when(message.javaConversions)(generateFromJavaProto(message))
       .call(generateMerge(message))
diff --git a/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala b/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala
index b9bce97b7..0ddcd8499 100644
--- a/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala
+++ b/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala
@@ -60,6 +60,7 @@ final case class MyContainer(
 
 object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyContainer] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyContainer] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyContainer = newBuilder.merge(input).result
   def merge(`_message__`: com.thesamet.docs.json.MyContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyContainer = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.thesamet.docs.json.MyContainer] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -94,7 +95,7 @@ object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.j
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __myAny = Option(_root_.scalapb.LiteParser.readMessage(_input__, __myAny.getOrElse(com.google.protobuf.any.Any.defaultInstance)))
+            __myAny = Option(__myAny.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.any.Any](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -106,8 +107,8 @@ object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.j
     }
     def result(): com.thesamet.docs.json.MyContainer = {
       com.thesamet.docs.json.MyContainer(
-          myAny = __myAny,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        myAny = __myAny,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala b/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala
index 6efc983fa..80054fc12 100644
--- a/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala
+++ b/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala
@@ -64,6 +64,7 @@ final case class MyMessage(
 
 object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyMessage] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyMessage] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyMessage = newBuilder.merge(input).result
   def merge(`_message__`: com.thesamet.docs.json.MyMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyMessage = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.thesamet.docs.json.MyMessage] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -104,8 +105,8 @@ object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.jso
     }
     def result(): com.thesamet.docs.json.MyMessage = {
       com.thesamet.docs.json.MyMessage(
-          x = __x,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        x = __x,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/mytypes/duration/Duration.scala b/docs/src/main/scala/mytypes/duration/Duration.scala
index 431607dba..ac18787c4 100644
--- a/docs/src/main/scala/mytypes/duration/Duration.scala
+++ b/docs/src/main/scala/mytypes/duration/Duration.scala
@@ -64,6 +64,7 @@ final case class Duration(
 
 object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Duration] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[mytypes.duration.Duration] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): mytypes.duration.Duration = newBuilder.merge(input).result
   def merge(`_message__`: mytypes.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): mytypes.duration.Duration = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[mytypes.duration.Duration] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -104,8 +105,8 @@ object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Durat
     }
     def result(): mytypes.duration.Duration = {
       mytypes.duration.Duration(
-          seconds = __seconds,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        seconds = __seconds,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/docs/person/Person.scala b/docs/src/main/scala/scalapb/docs/person/Person.scala
index 25d80bf6c..15ef1a06e 100644
--- a/docs/src/main/scala/scalapb/docs/person/Person.scala
+++ b/docs/src/main/scala/scalapb/docs/person/Person.scala
@@ -101,6 +101,7 @@ final case class Person(
 
 object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.docs.person.Person, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.docs.person.Person] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -148,7 +149,7 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
           case 16 =>
             __age = _input__.readInt32()
           case 26 =>
-            __addresses += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.docs.person.Person.Address.defaultInstance)
+            __addresses += _root_.scalapb.LiteParser.readMessage[scalapb.docs.person.Person.Address](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -160,10 +161,10 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
     }
     def result(): scalapb.docs.person.Person = {
       scalapb.docs.person.Person(
-          name = __name,
-          age = __age,
-          addresses = __addresses.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        age = __age,
+        addresses = __addresses.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -319,6 +320,7 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
   
   object Address extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person.Address] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person.Address] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person.Address = newBuilder.merge(input).result
     def merge(`_message__`: scalapb.docs.person.Person.Address, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person.Address = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.docs.person.Person.Address] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -373,10 +375,10 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
       }
       def result(): scalapb.docs.person.Person.Address = {
         scalapb.docs.person.Person.Address(
-            addressType = __addressType,
-            street = __street,
-            city = __city,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          addressType = __addressType,
+          street = __street,
+          city = __city,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/docs/src/main/scala/scalapb/perf/protos/Enum.scala b/docs/src/main/scala/scalapb/perf/protos/Enum.scala
index c7febe095..6d9ab5151 100644
--- a/docs/src/main/scala/scalapb/perf/protos/Enum.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/Enum.scala
@@ -64,6 +64,7 @@ final case class Enum(
 
 object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.Enum = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.Enum = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.Enum] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -108,8 +109,8 @@ object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum]
     }
     def result(): scalapb.perf.protos.Enum = {
       scalapb.perf.protos.Enum(
-          color = __color,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        color = __color,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala b/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala
index 9e3417376..f4795aee8 100644
--- a/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala
@@ -69,6 +69,7 @@ final case class EnumVector(
 
 object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.EnumVector] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.EnumVector] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.EnumVector = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.EnumVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.EnumVector = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.EnumVector] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -121,8 +122,8 @@ object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.
     }
     def result(): scalapb.perf.protos.EnumVector = {
       scalapb.perf.protos.EnumVector(
-          colors = __colors.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        colors = __colors.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/perf/protos/IntVector.scala b/docs/src/main/scala/scalapb/perf/protos/IntVector.scala
index 9a104b3e2..2f077c1b2 100644
--- a/docs/src/main/scala/scalapb/perf/protos/IntVector.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/IntVector.scala
@@ -69,6 +69,7 @@ final case class IntVector(
 
 object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.IntVector] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.IntVector] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.IntVector = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.IntVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.IntVector = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.IntVector] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -117,8 +118,8 @@ object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.I
     }
     def result(): scalapb.perf.protos.IntVector = {
       scalapb.perf.protos.IntVector(
-          ints = __ints.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        ints = __ints.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala b/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala
index 11248f667..562b58ee3 100644
--- a/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala
@@ -80,6 +80,7 @@ final case class MessageContainer(
 
 object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.MessageContainer] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.MessageContainer] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.MessageContainer = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.MessageContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.MessageContainer = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.MessageContainer] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -118,9 +119,9 @@ object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.p
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __opt = Option(_root_.scalapb.LiteParser.readMessage(_input__, __opt.getOrElse(scalapb.perf.protos.SimpleMessage.defaultInstance)))
+            __opt = Option(__opt.fold(_root_.scalapb.LiteParser.readMessage[scalapb.perf.protos.SimpleMessage](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 18 =>
-            __rep += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.perf.protos.SimpleMessage.defaultInstance)
+            __rep += _root_.scalapb.LiteParser.readMessage[scalapb.perf.protos.SimpleMessage](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -132,9 +133,9 @@ object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.p
     }
     def result(): scalapb.perf.protos.MessageContainer = {
       scalapb.perf.protos.MessageContainer(
-          opt = __opt,
-          rep = __rep.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        opt = __opt,
+        rep = __rep.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala b/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala
index ddc84a326..70ef262ca 100644
--- a/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala
@@ -124,6 +124,7 @@ final case class SimpleMessage(
 
 object SimpleMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.SimpleMessage] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.SimpleMessage] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.SimpleMessage = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.SimpleMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.SimpleMessage = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.SimpleMessage] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -183,11 +184,11 @@ object SimpleMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.prot
     }
     def result(): scalapb.perf.protos.SimpleMessage = {
       scalapb.perf.protos.SimpleMessage(
-          i = __i,
-          j = __j,
-          k = __k,
-          color = __color,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        i = __i,
+        j = __j,
+        k = __k,
+        color = __color,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala b/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala
index a0f232ae0..5e6a8d0d1 100644
--- a/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala
+++ b/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala
@@ -84,6 +84,7 @@ final case class StringMessage(
 
 object StringMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.StringMessage] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.StringMessage] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.StringMessage = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.perf.protos.StringMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.StringMessage = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.StringMessage] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -129,9 +130,9 @@ object StringMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.prot
     }
     def result(): scalapb.perf.protos.StringMessage = {
       scalapb.perf.protos.StringMessage(
-          str1 = __str1,
-          str2 = __str2,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        str1 = __str1,
+        str2 = __str2,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/e2e/src/main/protobuf/custom_types.proto b/e2e/src/main/protobuf/custom_types.proto
index 05dc7aa7d..e23934e09 100644
--- a/e2e/src/main/protobuf/custom_types.proto
+++ b/e2e/src/main/protobuf/custom_types.proto
@@ -46,6 +46,12 @@ message NoBoxEmail {
   optional string no_box_email   = 1              [(scalapb.field).type = "com.thesamet.pb.Email", (scalapb.field).no_box=true];
 }
 
+message ContainsHasEmail {
+  optional HasEmail optional_has_email = 1;
+  repeated HasEmail repeated_has_email = 2;
+  required HasEmail required_has_email = 3;
+}
+
 message OneofMessage {
   oneof one_of {
     string person_id = 1                 [(scalapb.field).type = "com.thesamet.pb.PersonId"];
diff --git a/e2e/src/main/scala/com/thesamet/pb/Email.scala b/e2e/src/main/scala/com/thesamet/pb/Email.scala
index c011fdbd0..807baf81e 100644
--- a/e2e/src/main/scala/com/thesamet/pb/Email.scala
+++ b/e2e/src/main/scala/com/thesamet/pb/Email.scala
@@ -7,8 +7,8 @@ case class Email(user: String, domain: String) {
 }
 
 object Email {
-  def fromString(s: String) = s.split("@", 1) match {
-    case Array(user, domain) => Email(user, domain)
+  def fromString(s: String) = s.split("@", 2).toSeq match {
+    case Seq(user, domain) => Email(user, domain)
     case _                   => throw new IllegalArgumentException(s"Expected @ in email. Got: $s")
   }
 
diff --git a/e2e/src/test/scala/CustomTypesSpec.scala b/e2e/src/test/scala/CustomTypesSpec.scala
index 3edc6f9af..97ab494e6 100644
--- a/e2e/src/test/scala/CustomTypesSpec.scala
+++ b/e2e/src/test/scala/CustomTypesSpec.scala
@@ -119,4 +119,11 @@ class CustomTypesSpec extends AnyFlatSpec with Matchers {
     )
     NoBoxEmail.parseFrom(dm.toByteArray) must be(dm)
   }
+
+  "ContainsHasEmail" should "serialize and parse valid instances" in {
+    val cem = ContainsHasEmail(
+      requiredHasEmail = HasEmail(requiredEmail = Email("foo", "bar"))
+    )
+    ContainsHasEmail.parseFrom(cem.toByteArray) must be(cem)
+  }
 }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala
index 5f27e1e05..858027c6f 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala
@@ -195,6 +195,7 @@ final case class Any(
 
 object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.JavaProtoSupport[com.google.protobuf.any.Any, com.google.protobuf.Any] with scalapb.AnyCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.JavaProtoSupport[com.google.protobuf.any.Any, com.google.protobuf.Any] with scalapb.AnyCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.any.Any): com.google.protobuf.Any = {
     val javaPbOut = com.google.protobuf.Any.newBuilder
     javaPbOut.setTypeUrl(scalaPbSource.typeUrl)
@@ -250,9 +251,9 @@ object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any
     }
     def result(): com.google.protobuf.any.Any = {
       com.google.protobuf.any.Any(
-          typeUrl = __typeUrl,
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        typeUrl = __typeUrl,
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala
index 0549971a8..01bb233a3 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala
@@ -217,6 +217,7 @@ final case class Api(
 
 object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] with scalapb.JavaProtoSupport[com.google.protobuf.api.Api, com.google.protobuf.Api] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] with scalapb.JavaProtoSupport[com.google.protobuf.api.Api, com.google.protobuf.Api] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.api.Api): com.google.protobuf.Api = {
     val javaPbOut = com.google.protobuf.Api.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -298,15 +299,15 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance)
+            __methods += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.api.Method](_input__)
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 34 =>
             __version = _input__.readStringRequireUtf8()
           case 42 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 50 =>
-            __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance)
+            __mixins += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.api.Mixin](_input__)
           case 56 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -320,14 +321,14 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api
     }
     def result(): com.google.protobuf.api.Api = {
       com.google.protobuf.api.Api(
-          name = __name,
-          methods = __methods.result(),
-          options = __options.result(),
-          version = __version,
-          sourceContext = __sourceContext,
-          mixins = __mixins.result(),
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        methods = __methods.result(),
+        options = __options.result(),
+        version = __version,
+        sourceContext = __sourceContext,
+        mixins = __mixins.result(),
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala
index b0e99addf..a619b49be 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala
@@ -199,6 +199,7 @@ final case class Method(
 
 object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] with scalapb.JavaProtoSupport[com.google.protobuf.api.Method, com.google.protobuf.Method] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] with scalapb.JavaProtoSupport[com.google.protobuf.api.Method, com.google.protobuf.Method] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.api.Method): com.google.protobuf.Method = {
     val javaPbOut = com.google.protobuf.Method.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -285,7 +286,7 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.
           case 40 =>
             __responseStreaming = _input__.readBool()
           case 50 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 56 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -299,14 +300,14 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.
     }
     def result(): com.google.protobuf.api.Method = {
       com.google.protobuf.api.Method(
-          name = __name,
-          requestTypeUrl = __requestTypeUrl,
-          requestStreaming = __requestStreaming,
-          responseTypeUrl = __responseTypeUrl,
-          responseStreaming = __responseStreaming,
-          options = __options.result(),
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        requestTypeUrl = __requestTypeUrl,
+        requestStreaming = __requestStreaming,
+        responseTypeUrl = __responseTypeUrl,
+        responseStreaming = __responseStreaming,
+        options = __options.result(),
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
index accb2d6fc..bec4a279c 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
@@ -169,6 +169,7 @@ final case class Mixin(
 
 object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] with scalapb.JavaProtoSupport[com.google.protobuf.api.Mixin, com.google.protobuf.Mixin] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] with scalapb.JavaProtoSupport[com.google.protobuf.api.Mixin, com.google.protobuf.Mixin] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.api.Mixin): com.google.protobuf.Mixin = {
     val javaPbOut = com.google.protobuf.Mixin.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -224,9 +225,9 @@ object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.M
     }
     def result(): com.google.protobuf.api.Mixin = {
       com.google.protobuf.api.Mixin(
-          name = __name,
-          root = __root,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        root = __root,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
index 1c544a761..7edcc150f 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
@@ -133,6 +133,7 @@ final case class CodeGeneratorRequest(
 
 object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorRequest, com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorRequest, com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.compiler.plugin.CodeGeneratorRequest): com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest = {
     val javaPbOut = com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest.newBuilder
     javaPbOut.addAllFileToGenerate(scalaPbSource.fileToGenerate.asJava)
@@ -195,9 +196,9 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google
           case 18 =>
             __parameter = Option(_input__.readStringRequireUtf8())
           case 122 =>
-            __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance)
+            __protoFile += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileDescriptorProto](_input__)
           case 26 =>
-            __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance)))
+            __compilerVersion = Option(__compilerVersion.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.compiler.plugin.Version](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -209,11 +210,11 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = {
       com.google.protobuf.compiler.plugin.CodeGeneratorRequest(
-          fileToGenerate = __fileToGenerate.result(),
-          parameter = __parameter,
-          protoFile = __protoFile.result(),
-          compilerVersion = __compilerVersion,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fileToGenerate = __fileToGenerate.result(),
+        parameter = __parameter,
+        protoFile = __protoFile.result(),
+        compilerVersion = __compilerVersion,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
index 2266ef15a..88616a32b 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
@@ -88,6 +88,7 @@ final case class CodeGeneratorResponse(
 
 object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorResponse, com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorResponse, com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse = {
     val javaPbOut = com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.newBuilder
     scalaPbSource.error.foreach(javaPbOut.setError)
@@ -140,7 +141,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
           case 10 =>
             __error = Option(_input__.readStringRequireUtf8())
           case 122 =>
-            __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance)
+            __file += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -152,9 +153,9 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = {
       com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
-          error = __error,
-          file = __file.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        error = __error,
+        file = __file.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -308,6 +309,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
   
   object File extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File): com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File = {
       val javaPbOut = com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File.newBuilder
       scalaPbSource.name.foreach(javaPbOut.setName)
@@ -370,10 +372,10 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
       }
       def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = {
         com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File(
-            name = __name,
-            insertionPoint = __insertionPoint,
-            content = __content,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          name = __name,
+          insertionPoint = __insertionPoint,
+          content = __content,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
index 51c79fd62..6e6a54893 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
@@ -106,6 +106,7 @@ final case class Version(
 
 object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.Version, com.google.protobuf.compiler.PluginProtos.Version] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] with scalapb.JavaProtoSupport[com.google.protobuf.compiler.plugin.Version, com.google.protobuf.compiler.PluginProtos.Version] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.compiler.plugin.Version): com.google.protobuf.compiler.PluginProtos.Version = {
     val javaPbOut = com.google.protobuf.compiler.PluginProtos.Version.newBuilder
     scalaPbSource.major.foreach(javaPbOut.setMajor)
@@ -175,11 +176,11 @@ object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.com
     }
     def result(): com.google.protobuf.compiler.plugin.Version = {
       com.google.protobuf.compiler.plugin.Version(
-          major = __major,
-          minor = __minor,
-          patch = __patch,
-          suffix = __suffix,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        major = __major,
+        minor = __minor,
+        patch = __patch,
+        suffix = __suffix,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
index 4b5aa8e45..8f3e2f4d9 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
@@ -215,6 +215,7 @@ final case class DescriptorProto(
 
 object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.DescriptorProto): com.google.protobuf.DescriptorProtos.DescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.DescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -315,21 +316,21 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __field += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 50 =>
-            __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __extension += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 26 =>
-            __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance)
+            __nestedType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto](_input__)
           case 34 =>
-            __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance)
+            __enumType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto](_input__)
           case 42 =>
-            __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance)
+            __extensionRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange](_input__)
           case 66 =>
-            __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance)
+            __oneofDecl += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.OneofDescriptorProto](_input__)
           case 58 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MessageOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 74 =>
-            __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance)
+            __reservedRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto.ReservedRange](_input__)
           case 82 =>
             __reservedName += _input__.readStringRequireUtf8()
           case tag =>
@@ -343,17 +344,17 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
     }
     def result(): com.google.protobuf.descriptor.DescriptorProto = {
       com.google.protobuf.descriptor.DescriptorProto(
-          name = __name,
-          field = __field.result(),
-          extension = __extension.result(),
-          nestedType = __nestedType.result(),
-          enumType = __enumType.result(),
-          extensionRange = __extensionRange.result(),
-          oneofDecl = __oneofDecl.result(),
-          options = __options,
-          reservedRange = __reservedRange.result(),
-          reservedName = __reservedName.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        field = __field.result(),
+        extension = __extension.result(),
+        nestedType = __nestedType.result(),
+        enumType = __enumType.result(),
+        extensionRange = __extensionRange.result(),
+        oneofDecl = __oneofDecl.result(),
+        options = __options,
+        reservedRange = __reservedRange.result(),
+        reservedName = __reservedName.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -470,6 +471,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
   
   object ExtensionRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange): com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.newBuilder
       scalaPbSource.start.foreach(javaPbOut.setStart)
@@ -526,7 +528,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
             case 16 =>
               __end = Option(_input__.readInt32())
             case 26 =>
-              __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance)))
+              __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ExtensionRangeOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -538,10 +540,10 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
       }
       def result(): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = {
         com.google.protobuf.descriptor.DescriptorProto.ExtensionRange(
-            start = __start,
-            end = __end,
-            options = __options,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          options = __options,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
@@ -660,6 +662,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
   
   object ReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ReservedRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, com.google.protobuf.DescriptorProtos.DescriptorProto.ReservedRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.DescriptorProto.ReservedRange): com.google.protobuf.DescriptorProtos.DescriptorProto.ReservedRange = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.DescriptorProto.ReservedRange.newBuilder
       scalaPbSource.start.foreach(javaPbOut.setStart)
@@ -715,9 +718,9 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
       }
       def result(): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = {
         com.google.protobuf.descriptor.DescriptorProto.ReservedRange(
-            start = __start,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
index 162daacc8..cd83441ab 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
@@ -134,6 +134,7 @@ final case class EnumDescriptorProto(
 
 object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumDescriptorProto, com.google.protobuf.DescriptorProtos.EnumDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.EnumDescriptorProto): com.google.protobuf.DescriptorProtos.EnumDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.EnumDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -203,11 +204,11 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance)
+            __value += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumValueDescriptorProto](_input__)
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 34 =>
-            __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance)
+            __reservedRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange](_input__)
           case 42 =>
             __reservedName += _input__.readStringRequireUtf8()
           case tag =>
@@ -221,12 +222,12 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.EnumDescriptorProto = {
       com.google.protobuf.descriptor.EnumDescriptorProto(
-          name = __name,
-          value = __value.result(),
-          options = __options,
-          reservedRange = __reservedRange.result(),
-          reservedName = __reservedName.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        value = __value.result(),
+        options = __options,
+        reservedRange = __reservedRange.result(),
+        reservedName = __reservedName.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -329,6 +330,7 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
   
   object EnumReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.EnumReservedRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, com.google.protobuf.DescriptorProtos.EnumDescriptorProto.EnumReservedRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange): com.google.protobuf.DescriptorProtos.EnumDescriptorProto.EnumReservedRange = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.EnumDescriptorProto.EnumReservedRange.newBuilder
       scalaPbSource.start.foreach(javaPbOut.setStart)
@@ -384,9 +386,9 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
       }
       def result(): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = {
         com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange(
-            start = __start,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
index cf9f2c5f8..0f7f2d309 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
@@ -101,6 +101,7 @@ final case class EnumOptions(
 
 object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumOptions, com.google.protobuf.DescriptorProtos.EnumOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumOptions, com.google.protobuf.DescriptorProtos.EnumOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.EnumOptions): com.google.protobuf.DescriptorProtos.EnumOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.EnumOptions.newBuilder
     scalaPbSource.allowAlias.foreach(javaPbOut.setAllowAlias)
@@ -157,7 +158,7 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 24 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -169,10 +170,10 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.descriptor.EnumOptions = {
       com.google.protobuf.descriptor.EnumOptions(
-          allowAlias = __allowAlias,
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        allowAlias = __allowAlias,
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
index 5ebbcf75f..b44f8d07c 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
@@ -90,6 +90,7 @@ final case class EnumValueDescriptorProto(
 
 object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumValueDescriptorProto, com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumValueDescriptorProto, com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.EnumValueDescriptorProto): com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -146,7 +147,7 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go
           case 16 =>
             __number = Option(_input__.readInt32())
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumValueOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -158,10 +159,10 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go
     }
     def result(): com.google.protobuf.descriptor.EnumValueDescriptorProto = {
       com.google.protobuf.descriptor.EnumValueDescriptorProto(
-          name = __name,
-          number = __number,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
index 98708c059..ae9326c9e 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
@@ -84,6 +84,7 @@ final case class EnumValueOptions(
 
 object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumValueOptions, com.google.protobuf.DescriptorProtos.EnumValueOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.EnumValueOptions, com.google.protobuf.DescriptorProtos.EnumValueOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.EnumValueOptions): com.google.protobuf.DescriptorProtos.EnumValueOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.EnumValueOptions.newBuilder
     scalaPbSource.deprecated.foreach(javaPbOut.setDeprecated)
@@ -133,7 +134,7 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro
           case 8 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -145,9 +146,9 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro
     }
     def result(): com.google.protobuf.descriptor.EnumValueOptions = {
       com.google.protobuf.descriptor.EnumValueOptions(
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
index cc7533e07..5d3a45823 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
@@ -65,6 +65,7 @@ final case class ExtensionRangeOptions(
 
 object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ExtensionRangeOptions, com.google.protobuf.DescriptorProtos.ExtensionRangeOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ExtensionRangeOptions, com.google.protobuf.DescriptorProtos.ExtensionRangeOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.ExtensionRangeOptions): com.google.protobuf.DescriptorProtos.ExtensionRangeOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.ExtensionRangeOptions.newBuilder
     javaPbOut.addAllUninterpretedOption(_root_.scalapb.internal.compat.toIterable(scalaPbSource.uninterpretedOption.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.toJavaProto)).asJava)
@@ -107,7 +108,7 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl
         _tag__ match {
           case 0 => _done__ = true
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -119,8 +120,8 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.descriptor.ExtensionRangeOptions = {
       com.google.protobuf.descriptor.ExtensionRangeOptions(
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
index e2bdf28d0..b2a19ef77 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
@@ -215,6 +215,7 @@ final case class FieldDescriptorProto(
 
 object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FieldDescriptorProto, com.google.protobuf.DescriptorProtos.FieldDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.FieldDescriptorProto): com.google.protobuf.DescriptorProtos.FieldDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.FieldDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -325,7 +326,7 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
           case 82 =>
             __jsonName = Option(_input__.readStringRequireUtf8())
           case 66 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -337,17 +338,17 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.descriptor.FieldDescriptorProto = {
       com.google.protobuf.descriptor.FieldDescriptorProto(
-          name = __name,
-          number = __number,
-          label = __label,
-          `type` = __type,
-          typeName = __typeName,
-          extendee = __extendee,
-          defaultValue = __defaultValue,
-          oneofIndex = __oneofIndex,
-          jsonName = __jsonName,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        label = __label,
+        `type` = __type,
+        typeName = __typeName,
+        extendee = __extendee,
+        defaultValue = __defaultValue,
+        oneofIndex = __oneofIndex,
+        jsonName = __jsonName,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
index 495769668..77805f05d 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
@@ -208,6 +208,7 @@ final case class FieldOptions(
 
 object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FieldOptions, com.google.protobuf.DescriptorProtos.FieldOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FieldOptions, com.google.protobuf.DescriptorProtos.FieldOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.FieldOptions): com.google.protobuf.DescriptorProtos.FieldOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.FieldOptions.newBuilder
     scalaPbSource.ctype.map(com.google.protobuf.descriptor.FieldOptions.CType.toJavaValue).foreach(javaPbOut.setCtype)
@@ -297,7 +298,7 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
           case 80 =>
             __weak = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -309,14 +310,14 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
     }
     def result(): com.google.protobuf.descriptor.FieldOptions = {
       com.google.protobuf.descriptor.FieldOptions(
-          ctype = __ctype,
-          packed = __packed,
-          jstype = __jstype,
-          `lazy` = __lazy,
-          deprecated = __deprecated,
-          weak = __weak,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        ctype = __ctype,
+        packed = __packed,
+        jstype = __jstype,
+        `lazy` = __lazy,
+        deprecated = __deprecated,
+        weak = __weak,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
index 303d50c8f..dc2989803 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
@@ -256,6 +256,7 @@ final case class FileDescriptorProto(
 
 object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileDescriptorProto, com.google.protobuf.DescriptorProtos.FileDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileDescriptorProto, com.google.protobuf.DescriptorProtos.FileDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.FileDescriptorProto): com.google.protobuf.DescriptorProtos.FileDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.FileDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -384,17 +385,17 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
             _input__.popLimit(oldLimit)
           }
           case 34 =>
-            __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance)
+            __messageType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto](_input__)
           case 42 =>
-            __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance)
+            __enumType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto](_input__)
           case 50 =>
-            __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance)
+            __service += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ServiceDescriptorProto](_input__)
           case 58 =>
-            __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __extension += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 66 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 74 =>
-            __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance)))
+            __sourceCodeInfo = Option(__sourceCodeInfo.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.SourceCodeInfo](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 98 =>
             __syntax = Option(_input__.readStringRequireUtf8())
           case tag =>
@@ -408,19 +409,19 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.FileDescriptorProto = {
       com.google.protobuf.descriptor.FileDescriptorProto(
-          name = __name,
-          `package` = __package,
-          dependency = __dependency.result(),
-          publicDependency = __publicDependency.result(),
-          weakDependency = __weakDependency.result(),
-          messageType = __messageType.result(),
-          enumType = __enumType.result(),
-          service = __service.result(),
-          extension = __extension.result(),
-          options = __options,
-          sourceCodeInfo = __sourceCodeInfo,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        `package` = __package,
+        dependency = __dependency.result(),
+        publicDependency = __publicDependency.result(),
+        weakDependency = __weakDependency.result(),
+        messageType = __messageType.result(),
+        enumType = __enumType.result(),
+        service = __service.result(),
+        extension = __extension.result(),
+        options = __options,
+        sourceCodeInfo = __sourceCodeInfo,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
index 66c472ad8..680153a58 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
@@ -65,6 +65,7 @@ final case class FileDescriptorSet(
 
 object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileDescriptorSet, com.google.protobuf.DescriptorProtos.FileDescriptorSet] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileDescriptorSet, com.google.protobuf.DescriptorProtos.FileDescriptorSet] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.FileDescriptorSet): com.google.protobuf.DescriptorProtos.FileDescriptorSet = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.FileDescriptorSet.newBuilder
     javaPbOut.addAllFile(_root_.scalapb.internal.compat.toIterable(scalaPbSource.file.iterator.map(com.google.protobuf.descriptor.FileDescriptorProto.toJavaProto)).asJava)
@@ -107,7 +108,7 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance)
+            __file += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileDescriptorProto](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -119,8 +120,8 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr
     }
     def result(): com.google.protobuf.descriptor.FileDescriptorSet = {
       com.google.protobuf.descriptor.FileDescriptorSet(
-          file = __file.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        file = __file.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
index 3af9d817c..47c8a94f0 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
@@ -423,6 +423,7 @@ final case class FileOptions(
 
 object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileOptions, com.google.protobuf.DescriptorProtos.FileOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.FileOptions, com.google.protobuf.DescriptorProtos.FileOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.FileOptions): com.google.protobuf.DescriptorProtos.FileOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.FileOptions.newBuilder
     scalaPbSource.javaPackage.foreach(javaPbOut.setJavaPackage)
@@ -609,7 +610,7 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 362 =>
             __rubyPackage = Option(_input__.readStringRequireUtf8())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -621,28 +622,28 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.descriptor.FileOptions = {
       com.google.protobuf.descriptor.FileOptions(
-          javaPackage = __javaPackage,
-          javaOuterClassname = __javaOuterClassname,
-          javaMultipleFiles = __javaMultipleFiles,
-          javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash,
-          javaStringCheckUtf8 = __javaStringCheckUtf8,
-          optimizeFor = __optimizeFor,
-          goPackage = __goPackage,
-          ccGenericServices = __ccGenericServices,
-          javaGenericServices = __javaGenericServices,
-          pyGenericServices = __pyGenericServices,
-          phpGenericServices = __phpGenericServices,
-          deprecated = __deprecated,
-          ccEnableArenas = __ccEnableArenas,
-          objcClassPrefix = __objcClassPrefix,
-          csharpNamespace = __csharpNamespace,
-          swiftPrefix = __swiftPrefix,
-          phpClassPrefix = __phpClassPrefix,
-          phpNamespace = __phpNamespace,
-          phpMetadataNamespace = __phpMetadataNamespace,
-          rubyPackage = __rubyPackage,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        javaPackage = __javaPackage,
+        javaOuterClassname = __javaOuterClassname,
+        javaMultipleFiles = __javaMultipleFiles,
+        javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash,
+        javaStringCheckUtf8 = __javaStringCheckUtf8,
+        optimizeFor = __optimizeFor,
+        goPackage = __goPackage,
+        ccGenericServices = __ccGenericServices,
+        javaGenericServices = __javaGenericServices,
+        pyGenericServices = __pyGenericServices,
+        phpGenericServices = __phpGenericServices,
+        deprecated = __deprecated,
+        ccEnableArenas = __ccEnableArenas,
+        objcClassPrefix = __objcClassPrefix,
+        csharpNamespace = __csharpNamespace,
+        swiftPrefix = __swiftPrefix,
+        phpClassPrefix = __phpClassPrefix,
+        phpNamespace = __phpNamespace,
+        phpMetadataNamespace = __phpMetadataNamespace,
+        rubyPackage = __rubyPackage,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
index ae4b1886d..bbf0a5b6f 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
@@ -70,6 +70,7 @@ final case class GeneratedCodeInfo(
 
 object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.GeneratedCodeInfo, com.google.protobuf.DescriptorProtos.GeneratedCodeInfo] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.GeneratedCodeInfo, com.google.protobuf.DescriptorProtos.GeneratedCodeInfo] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.GeneratedCodeInfo): com.google.protobuf.DescriptorProtos.GeneratedCodeInfo = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.GeneratedCodeInfo.newBuilder
     javaPbOut.addAllAnnotation(_root_.scalapb.internal.compat.toIterable(scalaPbSource.annotation.iterator.map(com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.toJavaProto)).asJava)
@@ -115,7 +116,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance)
+            __annotation += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -127,8 +128,8 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
     }
     def result(): com.google.protobuf.descriptor.GeneratedCodeInfo = {
       com.google.protobuf.descriptor.GeneratedCodeInfo(
-          annotation = __annotation.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        annotation = __annotation.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -263,6 +264,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
   
   object Annotation extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, com.google.protobuf.DescriptorProtos.GeneratedCodeInfo.Annotation] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, com.google.protobuf.DescriptorProtos.GeneratedCodeInfo.Annotation] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation): com.google.protobuf.DescriptorProtos.GeneratedCodeInfo.Annotation = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.GeneratedCodeInfo.Annotation.newBuilder
       javaPbOut.addAllPath(_root_.scalapb.internal.compat.toIterable(scalaPbSource.path.iterator.map(_root_.scala.Int.box)).asJava)
@@ -340,11 +342,11 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
       }
       def result(): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = {
         com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation(
-            path = __path.result(),
-            sourceFile = __sourceFile,
-            begin = __begin,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          path = __path.result(),
+          sourceFile = __sourceFile,
+          begin = __begin,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
index 5d80b7859..64dd357d9 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
@@ -171,6 +171,7 @@ final case class MessageOptions(
 
 object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MessageOptions, com.google.protobuf.DescriptorProtos.MessageOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MessageOptions, com.google.protobuf.DescriptorProtos.MessageOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.MessageOptions): com.google.protobuf.DescriptorProtos.MessageOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.MessageOptions.newBuilder
     scalaPbSource.messageSetWireFormat.foreach(javaPbOut.setMessageSetWireFormat)
@@ -241,7 +242,7 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
           case 56 =>
             __mapEntry = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -253,12 +254,12 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.MessageOptions = {
       com.google.protobuf.descriptor.MessageOptions(
-          messageSetWireFormat = __messageSetWireFormat,
-          noStandardDescriptorAccessor = __noStandardDescriptorAccessor,
-          deprecated = __deprecated,
-          mapEntry = __mapEntry,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        messageSetWireFormat = __messageSetWireFormat,
+        noStandardDescriptorAccessor = __noStandardDescriptorAccessor,
+        deprecated = __deprecated,
+        mapEntry = __mapEntry,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
index 4bce4fac7..b5ab5a084 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
@@ -140,6 +140,7 @@ final case class MethodDescriptorProto(
 
 object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MethodDescriptorProto, com.google.protobuf.DescriptorProtos.MethodDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MethodDescriptorProto, com.google.protobuf.DescriptorProtos.MethodDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.MethodDescriptorProto): com.google.protobuf.DescriptorProtos.MethodDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.MethodDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -213,7 +214,7 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl
           case 26 =>
             __outputType = Option(_input__.readStringRequireUtf8())
           case 34 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MethodOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 40 =>
             __clientStreaming = Option(_input__.readBool())
           case 48 =>
@@ -229,13 +230,13 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.descriptor.MethodDescriptorProto = {
       com.google.protobuf.descriptor.MethodDescriptorProto(
-          name = __name,
-          inputType = __inputType,
-          outputType = __outputType,
-          options = __options,
-          clientStreaming = __clientStreaming,
-          serverStreaming = __serverStreaming,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        inputType = __inputType,
+        outputType = __outputType,
+        options = __options,
+        clientStreaming = __clientStreaming,
+        serverStreaming = __serverStreaming,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
index c727d055d..7f6467382 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
@@ -98,6 +98,7 @@ final case class MethodOptions(
 
 object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MethodOptions, com.google.protobuf.DescriptorProtos.MethodOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.MethodOptions, com.google.protobuf.DescriptorProtos.MethodOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.MethodOptions): com.google.protobuf.DescriptorProtos.MethodOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.MethodOptions.newBuilder
     scalaPbSource.deprecated.foreach(javaPbOut.setDeprecated)
@@ -158,7 +159,7 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob
           case 272 =>
             __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum()))
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -170,10 +171,10 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob
     }
     def result(): com.google.protobuf.descriptor.MethodOptions = {
       com.google.protobuf.descriptor.MethodOptions(
-          deprecated = __deprecated,
-          idempotencyLevel = __idempotencyLevel,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        idempotencyLevel = __idempotencyLevel,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
index c72139fe4..99fc4d460 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
@@ -76,6 +76,7 @@ final case class OneofDescriptorProto(
 
 object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.OneofDescriptorProto, com.google.protobuf.DescriptorProtos.OneofDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.OneofDescriptorProto, com.google.protobuf.DescriptorProtos.OneofDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.OneofDescriptorProto): com.google.protobuf.DescriptorProtos.OneofDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.OneofDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -125,7 +126,7 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.OneofOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -137,9 +138,9 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.descriptor.OneofDescriptorProto = {
       com.google.protobuf.descriptor.OneofDescriptorProto(
-          name = __name,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
index d11d92ee9..00c8eb1a7 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
@@ -65,6 +65,7 @@ final case class OneofOptions(
 
 object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.OneofOptions, com.google.protobuf.DescriptorProtos.OneofOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.OneofOptions, com.google.protobuf.DescriptorProtos.OneofOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.OneofOptions): com.google.protobuf.DescriptorProtos.OneofOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.OneofOptions.newBuilder
     javaPbOut.addAllUninterpretedOption(_root_.scalapb.internal.compat.toIterable(scalaPbSource.uninterpretedOption.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.toJavaProto)).asJava)
@@ -107,7 +108,7 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
         _tag__ match {
           case 0 => _done__ = true
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -119,8 +120,8 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
     }
     def result(): com.google.protobuf.descriptor.OneofOptions = {
       com.google.protobuf.descriptor.OneofOptions(
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
index 249508100..df0019921 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
@@ -94,6 +94,7 @@ final case class ServiceDescriptorProto(
 
 object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ServiceDescriptorProto, com.google.protobuf.DescriptorProtos.ServiceDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ServiceDescriptorProto, com.google.protobuf.DescriptorProtos.ServiceDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.ServiceDescriptorProto): com.google.protobuf.DescriptorProtos.ServiceDescriptorProto = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.ServiceDescriptorProto.newBuilder
     scalaPbSource.name.foreach(javaPbOut.setName)
@@ -149,9 +150,9 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance)
+            __method += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MethodDescriptorProto](_input__)
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ServiceOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -163,10 +164,10 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog
     }
     def result(): com.google.protobuf.descriptor.ServiceDescriptorProto = {
       com.google.protobuf.descriptor.ServiceDescriptorProto(
-          name = __name,
-          method = __method.result(),
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        method = __method.result(),
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
index 5cd7efa6d..ed754c5a7 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
@@ -84,6 +84,7 @@ final case class ServiceOptions(
 
 object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ServiceOptions, com.google.protobuf.DescriptorProtos.ServiceOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.ServiceOptions, com.google.protobuf.DescriptorProtos.ServiceOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.ServiceOptions): com.google.protobuf.DescriptorProtos.ServiceOptions = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.ServiceOptions.newBuilder
     scalaPbSource.deprecated.foreach(javaPbOut.setDeprecated)
@@ -133,7 +134,7 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
           case 264 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -145,9 +146,9 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.ServiceOptions = {
       com.google.protobuf.descriptor.ServiceOptions(
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
index addb2ee33..47b6656b7 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
@@ -110,6 +110,7 @@ final case class SourceCodeInfo(
 
 object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.SourceCodeInfo, com.google.protobuf.DescriptorProtos.SourceCodeInfo] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.SourceCodeInfo, com.google.protobuf.DescriptorProtos.SourceCodeInfo] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.SourceCodeInfo): com.google.protobuf.DescriptorProtos.SourceCodeInfo = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.SourceCodeInfo.newBuilder
     javaPbOut.addAllLocation(_root_.scalapb.internal.compat.toIterable(scalaPbSource.location.iterator.map(com.google.protobuf.descriptor.SourceCodeInfo.Location.toJavaProto)).asJava)
@@ -155,7 +156,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance)
+            __location += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.SourceCodeInfo.Location](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -167,8 +168,8 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.SourceCodeInfo = {
       com.google.protobuf.descriptor.SourceCodeInfo(
-          location = __location.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        location = __location.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -395,6 +396,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
   
   object Location extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.SourceCodeInfo.Location, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.SourceCodeInfo.Location, com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.SourceCodeInfo.Location): com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location.newBuilder
       javaPbOut.addAllPath(_root_.scalapb.internal.compat.toIterable(scalaPbSource.path.iterator.map(_root_.scala.Int.box)).asJava)
@@ -487,12 +489,12 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
       }
       def result(): com.google.protobuf.descriptor.SourceCodeInfo.Location = {
         com.google.protobuf.descriptor.SourceCodeInfo.Location(
-            path = __path.result(),
-            span = __span.result(),
-            leadingComments = __leadingComments,
-            trailingComments = __trailingComments,
-            leadingDetachedComments = __leadingDetachedComments.result(),
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          path = __path.result(),
+          span = __span.result(),
+          leadingComments = __leadingComments,
+          trailingComments = __trailingComments,
+          leadingDetachedComments = __leadingDetachedComments.result(),
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
index 139a8c5bb..91680a66f 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
@@ -157,6 +157,7 @@ final case class UninterpretedOption(
 
 object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.UninterpretedOption, com.google.protobuf.DescriptorProtos.UninterpretedOption] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.UninterpretedOption): com.google.protobuf.DescriptorProtos.UninterpretedOption = {
     val javaPbOut = com.google.protobuf.DescriptorProtos.UninterpretedOption.newBuilder
     javaPbOut.addAllName(_root_.scalapb.internal.compat.toIterable(scalaPbSource.name.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.NamePart.toJavaProto)).asJava)
@@ -232,7 +233,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
         _tag__ match {
           case 0 => _done__ = true
           case 18 =>
-            __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance)
+            __name += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption.NamePart](_input__)
           case 26 =>
             __identifierValue = Option(_input__.readStringRequireUtf8())
           case 32 =>
@@ -256,14 +257,14 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.UninterpretedOption = {
       com.google.protobuf.descriptor.UninterpretedOption(
-          name = __name.result(),
-          identifierValue = __identifierValue,
-          positiveIntValue = __positiveIntValue,
-          negativeIntValue = __negativeIntValue,
-          doubleValue = __doubleValue,
-          stringValue = __stringValue,
-          aggregateValue = __aggregateValue,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name.result(),
+        identifierValue = __identifierValue,
+        positiveIntValue = __positiveIntValue,
+        negativeIntValue = __negativeIntValue,
+        doubleValue = __doubleValue,
+        stringValue = __stringValue,
+        aggregateValue = __aggregateValue,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -364,6 +365,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
   
   object NamePart extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.UninterpretedOption.NamePart, com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] with scalapb.JavaProtoSupport[com.google.protobuf.descriptor.UninterpretedOption.NamePart, com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = newBuilder.merge(input).result
     def toJavaProto(scalaPbSource: com.google.protobuf.descriptor.UninterpretedOption.NamePart): com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart = {
       val javaPbOut = com.google.protobuf.DescriptorProtos.UninterpretedOption.NamePart.newBuilder
       javaPbOut.setNamePart(scalaPbSource.namePart)
@@ -423,9 +425,9 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
       def result(): com.google.protobuf.descriptor.UninterpretedOption.NamePart = {
         if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } 
         com.google.protobuf.descriptor.UninterpretedOption.NamePart(
-            namePart = __namePart,
-            isExtension = __isExtension,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          namePart = __namePart,
+          isExtension = __isExtension,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
index d9def7685..f804957c1 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
@@ -155,6 +155,7 @@ final case class Duration(
 
 object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.JavaProtoSupport[com.google.protobuf.duration.Duration, com.google.protobuf.Duration] with scalapb.DurationCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.JavaProtoSupport[com.google.protobuf.duration.Duration, com.google.protobuf.Duration] with scalapb.DurationCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.duration.Duration): com.google.protobuf.Duration = {
     val javaPbOut = com.google.protobuf.Duration.newBuilder
     javaPbOut.setSeconds(scalaPbSource.seconds)
@@ -210,9 +211,9 @@ object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.du
     }
     def result(): com.google.protobuf.duration.Duration = {
       com.google.protobuf.duration.Duration(
-          seconds = __seconds,
-          nanos = __nanos,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        seconds = __seconds,
+        nanos = __nanos,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
index 1d8bf3053..fcc8ca789 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
@@ -47,6 +47,7 @@ final case class Empty(
 
 object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] with scalapb.JavaProtoSupport[com.google.protobuf.empty.Empty, com.google.protobuf.Empty] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] with scalapb.JavaProtoSupport[com.google.protobuf.empty.Empty, com.google.protobuf.Empty] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.empty.Empty): com.google.protobuf.Empty = {
     val javaPbOut = com.google.protobuf.Empty.newBuilder
     javaPbOut.build
@@ -88,7 +89,7 @@ object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty
     }
     def result(): com.google.protobuf.empty.Empty = {
       com.google.protobuf.empty.Empty(
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
index 01dd1c3cd..d2448747f 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
@@ -263,6 +263,7 @@ final case class FieldMask(
 
 object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] with scalapb.JavaProtoSupport[com.google.protobuf.field_mask.FieldMask, com.google.protobuf.FieldMask] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] with scalapb.JavaProtoSupport[com.google.protobuf.field_mask.FieldMask, com.google.protobuf.FieldMask] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.field_mask.FieldMask): com.google.protobuf.FieldMask = {
     val javaPbOut = com.google.protobuf.FieldMask.newBuilder
     javaPbOut.addAllPaths(scalaPbSource.paths.asJava)
@@ -311,8 +312,8 @@ object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.f
     }
     def result(): com.google.protobuf.field_mask.FieldMask = {
       com.google.protobuf.field_mask.FieldMask(
-          paths = __paths.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        paths = __paths.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
index e5e2ab4d6..dfc0e3b46 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
@@ -71,6 +71,7 @@ final case class SourceContext(
 
 object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] with scalapb.JavaProtoSupport[com.google.protobuf.source_context.SourceContext, com.google.protobuf.SourceContext] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] with scalapb.JavaProtoSupport[com.google.protobuf.source_context.SourceContext, com.google.protobuf.SourceContext] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.source_context.SourceContext): com.google.protobuf.SourceContext = {
     val javaPbOut = com.google.protobuf.SourceContext.newBuilder
     javaPbOut.setFileName(scalaPbSource.fileName)
@@ -119,8 +120,8 @@ object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protob
     }
     def result(): com.google.protobuf.source_context.SourceContext = {
       com.google.protobuf.source_context.SourceContext(
-          fileName = __fileName,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fileName = __fileName,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
index 3f3da1a6f..e03c767be 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
@@ -69,6 +69,7 @@ final case class ListValue(
 
 object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] with scalapb.JavaProtoSupport[com.google.protobuf.struct.ListValue, com.google.protobuf.ListValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] with scalapb.JavaProtoSupport[com.google.protobuf.struct.ListValue, com.google.protobuf.ListValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.struct.ListValue): com.google.protobuf.ListValue = {
     val javaPbOut = com.google.protobuf.ListValue.newBuilder
     javaPbOut.addAllValues(_root_.scalapb.internal.compat.toIterable(scalaPbSource.values.iterator.map(com.google.protobuf.struct.Value.toJavaProto)).asJava)
@@ -111,7 +112,7 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance)
+            __values += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Value](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -123,8 +124,8 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s
     }
     def result(): com.google.protobuf.struct.ListValue = {
       com.google.protobuf.struct.ListValue(
-          values = __values.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        values = __values.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
index 03d4d3304..e5f4f3e52 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
@@ -74,6 +74,7 @@ final case class Struct(
 
 object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] with scalapb.JavaProtoSupport[com.google.protobuf.struct.Struct, com.google.protobuf.Struct] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] with scalapb.JavaProtoSupport[com.google.protobuf.struct.Struct, com.google.protobuf.Struct] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.struct.Struct): com.google.protobuf.Struct = {
     val javaPbOut = com.google.protobuf.Struct.newBuilder
     javaPbOut
@@ -122,7 +123,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance))
+            __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Struct.FieldsEntry](_input__))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -134,8 +135,8 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
     }
     def result(): com.google.protobuf.struct.Struct = {
       com.google.protobuf.struct.Struct(
-          fields = __fields.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fields = __fields.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -226,6 +227,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
   
   object FieldsEntry extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct.FieldsEntry] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -265,7 +267,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
             case 10 =>
               __key = _input__.readStringRequireUtf8()
             case 18 =>
-              __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance)))
+              __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Value](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -277,9 +279,9 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
       }
       def result(): com.google.protobuf.struct.Struct.FieldsEntry = {
         com.google.protobuf.struct.Struct.FieldsEntry(
-            key = __key,
-            value = __value,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          key = __key,
+          value = __value,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala
index 0b7b962e0..a61b0c6e5 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala
@@ -130,6 +130,7 @@ final case class Value(
 
 object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] with scalapb.JavaProtoSupport[com.google.protobuf.struct.Value, com.google.protobuf.Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] with scalapb.JavaProtoSupport[com.google.protobuf.struct.Value, com.google.protobuf.Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.struct.Value): com.google.protobuf.Value = {
     val javaPbOut = com.google.protobuf.Value.newBuilder
     scalaPbSource.kind.nullValue.map(_.value).foreach(javaPbOut.setNullValueValue)
@@ -204,9 +205,9 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc
           case 32 =>
             __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool())
           case 42 =>
-            __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance)))
+            __kind = com.google.protobuf.struct.Value.Kind.StructValue(__kind.structValue.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Struct](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 50 =>
-            __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance)))
+            __kind = com.google.protobuf.struct.Value.Kind.ListValue(__kind.listValue.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.ListValue](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -218,8 +219,8 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc
     }
     def result(): com.google.protobuf.struct.Value = {
       com.google.protobuf.struct.Value(
-          kind = __kind,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        kind = __kind,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
index c3d2617fe..2faadffb2 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
@@ -175,6 +175,7 @@ final case class Timestamp(
 
 object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.JavaProtoSupport[com.google.protobuf.timestamp.Timestamp, com.google.protobuf.Timestamp] with scalapb.TimestampCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.JavaProtoSupport[com.google.protobuf.timestamp.Timestamp, com.google.protobuf.Timestamp] with scalapb.TimestampCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.timestamp.Timestamp): com.google.protobuf.Timestamp = {
     val javaPbOut = com.google.protobuf.Timestamp.newBuilder
     javaPbOut.setSeconds(scalaPbSource.seconds)
@@ -230,9 +231,9 @@ object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.t
     }
     def result(): com.google.protobuf.timestamp.Timestamp = {
       com.google.protobuf.timestamp.Timestamp(
-          seconds = __seconds,
-          nanos = __nanos,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        seconds = __seconds,
+        nanos = __nanos,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala
index f48e2f102..b89b86505 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala
@@ -148,6 +148,7 @@ final case class Enum(
 
 object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Enum, com.google.protobuf.Enum] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Enum, com.google.protobuf.Enum] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.`type`.Enum): com.google.protobuf.Enum = {
     val javaPbOut = com.google.protobuf.Enum.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -218,11 +219,11 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance)
+            __enumvalue += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.EnumValue](_input__)
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 34 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 40 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -236,12 +237,12 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
     }
     def result(): com.google.protobuf.`type`.Enum = {
       com.google.protobuf.`type`.Enum(
-          name = __name,
-          enumvalue = __enumvalue.result(),
-          options = __options.result(),
-          sourceContext = __sourceContext,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        enumvalue = __enumvalue.result(),
+        options = __options.result(),
+        sourceContext = __sourceContext,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
index 936725236..922c7a829 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
@@ -111,6 +111,7 @@ final case class EnumValue(
 
 object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.EnumValue, com.google.protobuf.EnumValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.EnumValue, com.google.protobuf.EnumValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.`type`.EnumValue): com.google.protobuf.EnumValue = {
     val javaPbOut = com.google.protobuf.EnumValue.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -167,7 +168,7 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`
           case 16 =>
             __number = _input__.readInt32()
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -179,10 +180,10 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`
     }
     def result(): com.google.protobuf.`type`.EnumValue = {
       com.google.protobuf.`type`.EnumValue(
-          name = __name,
-          number = __number,
-          options = __options.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        options = __options.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala
index c52d1625f..6b969f7fc 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala
@@ -267,6 +267,7 @@ final case class Field(
 
 object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Field, com.google.protobuf.Field] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Field, com.google.protobuf.Field] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.`type`.Field): com.google.protobuf.Field = {
     val javaPbOut = com.google.protobuf.Field.newBuilder
     javaPbOut.setKindValue(scalaPbSource.kind.value)
@@ -373,7 +374,7 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type
           case 64 =>
             __packed = _input__.readBool()
           case 74 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 82 =>
             __jsonName = _input__.readStringRequireUtf8()
           case 90 =>
@@ -389,17 +390,17 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type
     }
     def result(): com.google.protobuf.`type`.Field = {
       com.google.protobuf.`type`.Field(
-          kind = __kind,
-          cardinality = __cardinality,
-          number = __number,
-          name = __name,
-          typeUrl = __typeUrl,
-          oneofIndex = __oneofIndex,
-          packed = __packed,
-          options = __options.result(),
-          jsonName = __jsonName,
-          defaultValue = __defaultValue,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        kind = __kind,
+        cardinality = __cardinality,
+        number = __number,
+        name = __name,
+        typeUrl = __typeUrl,
+        oneofIndex = __oneofIndex,
+        packed = __packed,
+        options = __options.result(),
+        jsonName = __jsonName,
+        defaultValue = __defaultValue,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
index 9b553a972..af65664a9 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
@@ -94,6 +94,7 @@ final case class OptionProto(
 
 object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.OptionProto, com.google.protobuf.Option] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.OptionProto, com.google.protobuf.Option] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.`type`.OptionProto): com.google.protobuf.Option = {
     val javaPbOut = com.google.protobuf.Option.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -143,7 +144,7 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance)))
+            __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.any.Any](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -155,9 +156,9 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.`type`.OptionProto = {
       com.google.protobuf.`type`.OptionProto(
-          name = __name,
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala
index 1e838a7de..8d478a5ad 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala
@@ -165,6 +165,7 @@ final case class Type(
 
 object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Type, com.google.protobuf.Type] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] with scalapb.JavaProtoSupport[com.google.protobuf.`type`.Type, com.google.protobuf.Type] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.`type`.Type): com.google.protobuf.Type = {
     val javaPbOut = com.google.protobuf.Type.newBuilder
     javaPbOut.setName(scalaPbSource.name)
@@ -240,13 +241,13 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance)
+            __fields += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.Field](_input__)
           case 26 =>
             __oneofs += _input__.readStringRequireUtf8()
           case 34 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 42 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 48 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -260,13 +261,13 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
     }
     def result(): com.google.protobuf.`type`.Type = {
       com.google.protobuf.`type`.Type(
-          name = __name,
-          fields = __fields.result(),
-          oneofs = __oneofs.result(),
-          options = __options.result(),
-          sourceContext = __sourceContext,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        fields = __fields.result(),
+        oneofs = __oneofs.result(),
+        options = __options.result(),
+        sourceContext = __sourceContext,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
index b376330dc..5b4200466 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
@@ -71,6 +71,7 @@ final case class BoolValue(
 
 object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.BoolValue, com.google.protobuf.BoolValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.BoolValue, com.google.protobuf.BoolValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.BoolValue): com.google.protobuf.BoolValue = {
     val javaPbOut = com.google.protobuf.BoolValue.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.w
     }
     def result(): com.google.protobuf.wrappers.BoolValue = {
       com.google.protobuf.wrappers.BoolValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
index bd6872d90..cdb8d99de 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
@@ -71,6 +71,7 @@ final case class BytesValue(
 
 object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.BytesValue, com.google.protobuf.BytesValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.BytesValue, com.google.protobuf.BytesValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.BytesValue): com.google.protobuf.BytesValue = {
     val javaPbOut = com.google.protobuf.BytesValue.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.BytesValue = {
       com.google.protobuf.wrappers.BytesValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
index b08d61239..1749dddbe 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
@@ -71,6 +71,7 @@ final case class DoubleValue(
 
 object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.DoubleValue, com.google.protobuf.DoubleValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.DoubleValue, com.google.protobuf.DoubleValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.DoubleValue): com.google.protobuf.DoubleValue = {
     val javaPbOut = com.google.protobuf.DoubleValue.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.DoubleValue = {
       com.google.protobuf.wrappers.DoubleValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
index d8e8ee50e..7410fe1e3 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
@@ -71,6 +71,7 @@ final case class FloatValue(
 
 object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.FloatValue, com.google.protobuf.FloatValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.FloatValue, com.google.protobuf.FloatValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.FloatValue): com.google.protobuf.FloatValue = {
     val javaPbOut = com.google.protobuf.FloatValue.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.FloatValue = {
       com.google.protobuf.wrappers.FloatValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
index d5a775e46..94c63f374 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
@@ -71,6 +71,7 @@ final case class Int32Value(
 
 object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.Int32Value, com.google.protobuf.Int32Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.Int32Value, com.google.protobuf.Int32Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.Int32Value): com.google.protobuf.Int32Value = {
     val javaPbOut = com.google.protobuf.Int32Value.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.Int32Value = {
       com.google.protobuf.wrappers.Int32Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
index 9c6f7cd88..cc90b3e0e 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
@@ -71,6 +71,7 @@ final case class Int64Value(
 
 object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.Int64Value, com.google.protobuf.Int64Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.Int64Value, com.google.protobuf.Int64Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.Int64Value): com.google.protobuf.Int64Value = {
     val javaPbOut = com.google.protobuf.Int64Value.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.Int64Value = {
       com.google.protobuf.wrappers.Int64Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
index c48740a72..6581b5a16 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
@@ -71,6 +71,7 @@ final case class StringValue(
 
 object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.StringValue, com.google.protobuf.StringValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.StringValue, com.google.protobuf.StringValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.StringValue): com.google.protobuf.StringValue = {
     val javaPbOut = com.google.protobuf.StringValue.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.StringValue = {
       com.google.protobuf.wrappers.StringValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
index 2ddea013f..f79262287 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
@@ -71,6 +71,7 @@ final case class UInt32Value(
 
 object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.UInt32Value, com.google.protobuf.UInt32Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.UInt32Value, com.google.protobuf.UInt32Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.UInt32Value): com.google.protobuf.UInt32Value = {
     val javaPbOut = com.google.protobuf.UInt32Value.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.UInt32Value = {
       com.google.protobuf.wrappers.UInt32Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
index ab1214f55..5bf7c70ba 100644
--- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
+++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
@@ -71,6 +71,7 @@ final case class UInt64Value(
 
 object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.UInt64Value, com.google.protobuf.UInt64Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] with scalapb.JavaProtoSupport[com.google.protobuf.wrappers.UInt64Value, com.google.protobuf.UInt64Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = newBuilder.merge(input).result
   def toJavaProto(scalaPbSource: com.google.protobuf.wrappers.UInt64Value): com.google.protobuf.UInt64Value = {
     val javaPbOut = com.google.protobuf.UInt64Value.newBuilder
     javaPbOut.setValue(scalaPbSource.value)
@@ -119,8 +120,8 @@ object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.UInt64Value = {
       com.google.protobuf.wrappers.UInt64Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala
index 9e7f7cf6a..72ac15b7b 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala
@@ -195,6 +195,7 @@ final case class Any(
 
 object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.AnyCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.AnyCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.any.Any, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.any.Any] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -240,9 +241,9 @@ object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any
     }
     def result(): com.google.protobuf.any.Any = {
       com.google.protobuf.any.Any(
-          typeUrl = __typeUrl,
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        typeUrl = __typeUrl,
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala
index 7948fff3d..078e2ae40 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala
@@ -216,6 +216,7 @@ final case class Api(
 
 object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.api.Api, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Api] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -277,15 +278,15 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance)
+            __methods += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.api.Method](_input__)
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 34 =>
             __version = _input__.readStringRequireUtf8()
           case 42 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 50 =>
-            __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance)
+            __mixins += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.api.Mixin](_input__)
           case 56 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -299,14 +300,14 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api
     }
     def result(): com.google.protobuf.api.Api = {
       com.google.protobuf.api.Api(
-          name = __name,
-          methods = __methods.result(),
-          options = __options.result(),
-          version = __version,
-          sourceContext = __sourceContext,
-          mixins = __mixins.result(),
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        methods = __methods.result(),
+        options = __options.result(),
+        version = __version,
+        sourceContext = __sourceContext,
+        mixins = __mixins.result(),
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala
index 11b0e0bcc..283a5b301 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala
@@ -198,6 +198,7 @@ final case class Method(
 
 object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.api.Method, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Method] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -264,7 +265,7 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.
           case 40 =>
             __responseStreaming = _input__.readBool()
           case 50 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 56 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -278,14 +279,14 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.
     }
     def result(): com.google.protobuf.api.Method = {
       com.google.protobuf.api.Method(
-          name = __name,
-          requestTypeUrl = __requestTypeUrl,
-          requestStreaming = __requestStreaming,
-          responseTypeUrl = __responseTypeUrl,
-          responseStreaming = __responseStreaming,
-          options = __options.result(),
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        requestTypeUrl = __requestTypeUrl,
+        requestStreaming = __requestStreaming,
+        responseTypeUrl = __responseTypeUrl,
+        responseStreaming = __responseStreaming,
+        options = __options.result(),
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
index 81e60fd92..fdb2acaa3 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala
@@ -169,6 +169,7 @@ final case class Mixin(
 
 object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.api.Mixin, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Mixin] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -214,9 +215,9 @@ object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.M
     }
     def result(): com.google.protobuf.api.Mixin = {
       com.google.protobuf.api.Mixin(
-          name = __name,
-          root = __root,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        root = __root,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
index fbdeec488..ba046577f 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala
@@ -132,6 +132,7 @@ final case class CodeGeneratorRequest(
 
 object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -180,9 +181,9 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google
           case 18 =>
             __parameter = Option(_input__.readStringRequireUtf8())
           case 122 =>
-            __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance)
+            __protoFile += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileDescriptorProto](_input__)
           case 26 =>
-            __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance)))
+            __compilerVersion = Option(__compilerVersion.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.compiler.plugin.Version](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -194,11 +195,11 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = {
       com.google.protobuf.compiler.plugin.CodeGeneratorRequest(
-          fileToGenerate = __fileToGenerate.result(),
-          parameter = __parameter,
-          protoFile = __protoFile.result(),
-          compilerVersion = __compilerVersion,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fileToGenerate = __fileToGenerate.result(),
+        parameter = __parameter,
+        protoFile = __protoFile.result(),
+        compilerVersion = __compilerVersion,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
index 75ca7bde9..d59c9a454 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
@@ -87,6 +87,7 @@ final case class CodeGeneratorResponse(
 
 object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -129,7 +130,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
           case 10 =>
             __error = Option(_input__.readStringRequireUtf8())
           case 122 =>
-            __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance)
+            __file += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -141,9 +142,9 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = {
       com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
-          error = __error,
-          file = __file.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        error = __error,
+        file = __file.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -297,6 +298,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
   
   object File extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -347,10 +349,10 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
       }
       def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = {
         com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File(
-            name = __name,
-            insertionPoint = __insertionPoint,
-            content = __content,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          name = __name,
+          insertionPoint = __insertionPoint,
+          content = __content,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
index 4e3d166b9..319d531eb 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala
@@ -106,6 +106,7 @@ final case class Version(
 
 object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.compiler.plugin.Version, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.Version] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -161,11 +162,11 @@ object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.com
     }
     def result(): com.google.protobuf.compiler.plugin.Version = {
       com.google.protobuf.compiler.plugin.Version(
-          major = __major,
-          minor = __minor,
-          patch = __patch,
-          suffix = __suffix,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        major = __major,
+        minor = __minor,
+        patch = __patch,
+        suffix = __suffix,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
index b59cb36f6..ad446ffdd 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
@@ -214,6 +214,7 @@ final case class DescriptorProto(
 
 object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -288,21 +289,21 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __field += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 50 =>
-            __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __extension += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 26 =>
-            __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance)
+            __nestedType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto](_input__)
           case 34 =>
-            __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance)
+            __enumType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto](_input__)
           case 42 =>
-            __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance)
+            __extensionRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange](_input__)
           case 66 =>
-            __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance)
+            __oneofDecl += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.OneofDescriptorProto](_input__)
           case 58 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MessageOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 74 =>
-            __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance)
+            __reservedRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto.ReservedRange](_input__)
           case 82 =>
             __reservedName += _input__.readStringRequireUtf8()
           case tag =>
@@ -316,17 +317,17 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
     }
     def result(): com.google.protobuf.descriptor.DescriptorProto = {
       com.google.protobuf.descriptor.DescriptorProto(
-          name = __name,
-          field = __field.result(),
-          extension = __extension.result(),
-          nestedType = __nestedType.result(),
-          enumType = __enumType.result(),
-          extensionRange = __extensionRange.result(),
-          oneofDecl = __oneofDecl.result(),
-          options = __options,
-          reservedRange = __reservedRange.result(),
-          reservedName = __reservedName.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        field = __field.result(),
+        extension = __extension.result(),
+        nestedType = __nestedType.result(),
+        enumType = __enumType.result(),
+        extensionRange = __extensionRange.result(),
+        oneofDecl = __oneofDecl.result(),
+        options = __options,
+        reservedRange = __reservedRange.result(),
+        reservedName = __reservedName.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -443,6 +444,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
   
   object ExtensionRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -487,7 +489,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
             case 16 =>
               __end = Option(_input__.readInt32())
             case 26 =>
-              __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance)))
+              __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ExtensionRangeOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -499,10 +501,10 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
       }
       def result(): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = {
         com.google.protobuf.descriptor.DescriptorProto.ExtensionRange(
-            start = __start,
-            end = __end,
-            options = __options,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          options = __options,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
@@ -621,6 +623,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
   
   object ReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -666,9 +669,9 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
       }
       def result(): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = {
         com.google.protobuf.descriptor.DescriptorProto.ReservedRange(
-            start = __start,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
index 7e687d0c2..8eac26136 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala
@@ -133,6 +133,7 @@ final case class EnumDescriptorProto(
 
 object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -186,11 +187,11 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance)
+            __value += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumValueDescriptorProto](_input__)
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 34 =>
-            __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance)
+            __reservedRange += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange](_input__)
           case 42 =>
             __reservedName += _input__.readStringRequireUtf8()
           case tag =>
@@ -204,12 +205,12 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.EnumDescriptorProto = {
       com.google.protobuf.descriptor.EnumDescriptorProto(
-          name = __name,
-          value = __value.result(),
-          options = __options,
-          reservedRange = __reservedRange.result(),
-          reservedName = __reservedName.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        value = __value.result(),
+        options = __options,
+        reservedRange = __reservedRange.result(),
+        reservedName = __reservedName.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -312,6 +313,7 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
   
   object EnumReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -357,9 +359,9 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
       }
       def result(): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = {
         com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange(
-            start = __start,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          start = __start,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
index a7145c50f..4a6ce2ca3 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala
@@ -100,6 +100,7 @@ final case class EnumOptions(
 
 object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -144,7 +145,7 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 24 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -156,10 +157,10 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.descriptor.EnumOptions = {
       com.google.protobuf.descriptor.EnumOptions(
-          allowAlias = __allowAlias,
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        allowAlias = __allowAlias,
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
index 8e8113392..85c66245d 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala
@@ -90,6 +90,7 @@ final case class EnumValueDescriptorProto(
 
 object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -134,7 +135,7 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go
           case 16 =>
             __number = Option(_input__.readInt32())
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumValueOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -146,10 +147,10 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go
     }
     def result(): com.google.protobuf.descriptor.EnumValueDescriptorProto = {
       com.google.protobuf.descriptor.EnumValueDescriptorProto(
-          name = __name,
-          number = __number,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
index 514449905..7f6f24fde 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala
@@ -83,6 +83,7 @@ final case class EnumValueOptions(
 
 object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -122,7 +123,7 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro
           case 8 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -134,9 +135,9 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro
     }
     def result(): com.google.protobuf.descriptor.EnumValueOptions = {
       com.google.protobuf.descriptor.EnumValueOptions(
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
index a069f3d35..2d8f804f6 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala
@@ -64,6 +64,7 @@ final case class ExtensionRangeOptions(
 
 object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ExtensionRangeOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -98,7 +99,7 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl
         _tag__ match {
           case 0 => _done__ = true
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -110,8 +111,8 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.descriptor.ExtensionRangeOptions = {
       com.google.protobuf.descriptor.ExtensionRangeOptions(
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
index 67548ce7e..6b3c8a39f 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala
@@ -215,6 +215,7 @@ final case class FieldDescriptorProto(
 
 object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -299,7 +300,7 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
           case 82 =>
             __jsonName = Option(_input__.readStringRequireUtf8())
           case 66 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -311,17 +312,17 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.descriptor.FieldDescriptorProto = {
       com.google.protobuf.descriptor.FieldDescriptorProto(
-          name = __name,
-          number = __number,
-          label = __label,
-          `type` = __type,
-          typeName = __typeName,
-          extendee = __extendee,
-          defaultValue = __defaultValue,
-          oneofIndex = __oneofIndex,
-          jsonName = __jsonName,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        label = __label,
+        `type` = __type,
+        typeName = __typeName,
+        extendee = __extendee,
+        defaultValue = __defaultValue,
+        oneofIndex = __oneofIndex,
+        jsonName = __jsonName,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
index 08da04ab4..4f024c27c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala
@@ -207,6 +207,7 @@ final case class FieldOptions(
 
 object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -276,7 +277,7 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
           case 80 =>
             __weak = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -288,14 +289,14 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
     }
     def result(): com.google.protobuf.descriptor.FieldOptions = {
       com.google.protobuf.descriptor.FieldOptions(
-          ctype = __ctype,
-          packed = __packed,
-          jstype = __jstype,
-          `lazy` = __lazy,
-          deprecated = __deprecated,
-          weak = __weak,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        ctype = __ctype,
+        packed = __packed,
+        jstype = __jstype,
+        `lazy` = __lazy,
+        deprecated = __deprecated,
+        weak = __weak,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
index 9ab0ee125..6a7904399 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala
@@ -255,6 +255,7 @@ final case class FileDescriptorProto(
 
 object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -353,17 +354,17 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
             _input__.popLimit(oldLimit)
           }
           case 34 =>
-            __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance)
+            __messageType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.DescriptorProto](_input__)
           case 42 =>
-            __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance)
+            __enumType += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.EnumDescriptorProto](_input__)
           case 50 =>
-            __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance)
+            __service += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ServiceDescriptorProto](_input__)
           case 58 =>
-            __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance)
+            __extension += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FieldDescriptorProto](_input__)
           case 66 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 74 =>
-            __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance)))
+            __sourceCodeInfo = Option(__sourceCodeInfo.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.SourceCodeInfo](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 98 =>
             __syntax = Option(_input__.readStringRequireUtf8())
           case tag =>
@@ -377,19 +378,19 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.FileDescriptorProto = {
       com.google.protobuf.descriptor.FileDescriptorProto(
-          name = __name,
-          `package` = __package,
-          dependency = __dependency.result(),
-          publicDependency = __publicDependency.result(),
-          weakDependency = __weakDependency.result(),
-          messageType = __messageType.result(),
-          enumType = __enumType.result(),
-          service = __service.result(),
-          extension = __extension.result(),
-          options = __options,
-          sourceCodeInfo = __sourceCodeInfo,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        `package` = __package,
+        dependency = __dependency.result(),
+        publicDependency = __publicDependency.result(),
+        weakDependency = __weakDependency.result(),
+        messageType = __messageType.result(),
+        enumType = __enumType.result(),
+        service = __service.result(),
+        extension = __extension.result(),
+        options = __options,
+        sourceCodeInfo = __sourceCodeInfo,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
index e69d98a1a..93621d9a2 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala
@@ -64,6 +64,7 @@ final case class FileDescriptorSet(
 
 object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorSet] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -98,7 +99,7 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance)
+            __file += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.FileDescriptorProto](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -110,8 +111,8 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr
     }
     def result(): com.google.protobuf.descriptor.FileDescriptorSet = {
       com.google.protobuf.descriptor.FileDescriptorSet(
-          file = __file.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        file = __file.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
index 2563cfcf3..0842cb580 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala
@@ -422,6 +422,7 @@ final case class FileOptions(
 
 object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.FileOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -560,7 +561,7 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 362 =>
             __rubyPackage = Option(_input__.readStringRequireUtf8())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -572,28 +573,28 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.descriptor.FileOptions = {
       com.google.protobuf.descriptor.FileOptions(
-          javaPackage = __javaPackage,
-          javaOuterClassname = __javaOuterClassname,
-          javaMultipleFiles = __javaMultipleFiles,
-          javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash,
-          javaStringCheckUtf8 = __javaStringCheckUtf8,
-          optimizeFor = __optimizeFor,
-          goPackage = __goPackage,
-          ccGenericServices = __ccGenericServices,
-          javaGenericServices = __javaGenericServices,
-          pyGenericServices = __pyGenericServices,
-          phpGenericServices = __phpGenericServices,
-          deprecated = __deprecated,
-          ccEnableArenas = __ccEnableArenas,
-          objcClassPrefix = __objcClassPrefix,
-          csharpNamespace = __csharpNamespace,
-          swiftPrefix = __swiftPrefix,
-          phpClassPrefix = __phpClassPrefix,
-          phpNamespace = __phpNamespace,
-          phpMetadataNamespace = __phpMetadataNamespace,
-          rubyPackage = __rubyPackage,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        javaPackage = __javaPackage,
+        javaOuterClassname = __javaOuterClassname,
+        javaMultipleFiles = __javaMultipleFiles,
+        javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash,
+        javaStringCheckUtf8 = __javaStringCheckUtf8,
+        optimizeFor = __optimizeFor,
+        goPackage = __goPackage,
+        ccGenericServices = __ccGenericServices,
+        javaGenericServices = __javaGenericServices,
+        pyGenericServices = __pyGenericServices,
+        phpGenericServices = __phpGenericServices,
+        deprecated = __deprecated,
+        ccEnableArenas = __ccEnableArenas,
+        objcClassPrefix = __objcClassPrefix,
+        csharpNamespace = __csharpNamespace,
+        swiftPrefix = __swiftPrefix,
+        phpClassPrefix = __phpClassPrefix,
+        phpNamespace = __phpNamespace,
+        phpMetadataNamespace = __phpMetadataNamespace,
+        rubyPackage = __rubyPackage,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
index 23f8c66f3..0102152a9 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala
@@ -69,6 +69,7 @@ final case class GeneratedCodeInfo(
 
 object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -106,7 +107,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance)
+            __annotation += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -118,8 +119,8 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
     }
     def result(): com.google.protobuf.descriptor.GeneratedCodeInfo = {
       com.google.protobuf.descriptor.GeneratedCodeInfo(
-          annotation = __annotation.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        annotation = __annotation.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -254,6 +255,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
   
   object Annotation extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -317,11 +319,11 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr
       }
       def result(): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = {
         com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation(
-            path = __path.result(),
-            sourceFile = __sourceFile,
-            begin = __begin,
-            end = __end,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          path = __path.result(),
+          sourceFile = __sourceFile,
+          begin = __begin,
+          end = __end,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
index a052ae7d7..34212f19d 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala
@@ -170,6 +170,7 @@ final case class MessageOptions(
 
 object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MessageOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -224,7 +225,7 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
           case 56 =>
             __mapEntry = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -236,12 +237,12 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.MessageOptions = {
       com.google.protobuf.descriptor.MessageOptions(
-          messageSetWireFormat = __messageSetWireFormat,
-          noStandardDescriptorAccessor = __noStandardDescriptorAccessor,
-          deprecated = __deprecated,
-          mapEntry = __mapEntry,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        messageSetWireFormat = __messageSetWireFormat,
+        noStandardDescriptorAccessor = __noStandardDescriptorAccessor,
+        deprecated = __deprecated,
+        mapEntry = __mapEntry,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
index 9411f9aeb..1293faabd 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala
@@ -140,6 +140,7 @@ final case class MethodDescriptorProto(
 
 object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -195,7 +196,7 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl
           case 26 =>
             __outputType = Option(_input__.readStringRequireUtf8())
           case 34 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MethodOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 40 =>
             __clientStreaming = Option(_input__.readBool())
           case 48 =>
@@ -211,13 +212,13 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl
     }
     def result(): com.google.protobuf.descriptor.MethodDescriptorProto = {
       com.google.protobuf.descriptor.MethodDescriptorProto(
-          name = __name,
-          inputType = __inputType,
-          outputType = __outputType,
-          options = __options,
-          clientStreaming = __clientStreaming,
-          serverStreaming = __serverStreaming,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        inputType = __inputType,
+        outputType = __outputType,
+        options = __options,
+        clientStreaming = __clientStreaming,
+        serverStreaming = __serverStreaming,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
index bd181e2f9..6beb01c24 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala
@@ -97,6 +97,7 @@ final case class MethodOptions(
 
 object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.MethodOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -145,7 +146,7 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob
           case 272 =>
             __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum()))
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -157,10 +158,10 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob
     }
     def result(): com.google.protobuf.descriptor.MethodOptions = {
       com.google.protobuf.descriptor.MethodOptions(
-          deprecated = __deprecated,
-          idempotencyLevel = __idempotencyLevel,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        idempotencyLevel = __idempotencyLevel,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
index 8a5996d63..2366bf08f 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala
@@ -76,6 +76,7 @@ final case class OneofDescriptorProto(
 
 object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -115,7 +116,7 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.OneofOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -127,9 +128,9 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google
     }
     def result(): com.google.protobuf.descriptor.OneofDescriptorProto = {
       com.google.protobuf.descriptor.OneofDescriptorProto(
-          name = __name,
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
index bc98728ee..39b314b10 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala
@@ -64,6 +64,7 @@ final case class OneofOptions(
 
 object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -98,7 +99,7 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
         _tag__ match {
           case 0 => _done__ = true
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -110,8 +111,8 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu
     }
     def result(): com.google.protobuf.descriptor.OneofOptions = {
       com.google.protobuf.descriptor.OneofOptions(
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
index 04819d6d2..cc60ffb85 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala
@@ -93,6 +93,7 @@ final case class ServiceDescriptorProto(
 
 object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceDescriptorProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -136,9 +137,9 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog
           case 10 =>
             __name = Option(_input__.readStringRequireUtf8())
           case 18 =>
-            __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance)
+            __method += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.MethodDescriptorProto](_input__)
           case 26 =>
-            __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance)))
+            __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.ServiceOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -150,10 +151,10 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog
     }
     def result(): com.google.protobuf.descriptor.ServiceDescriptorProto = {
       com.google.protobuf.descriptor.ServiceDescriptorProto(
-          name = __name,
-          method = __method.result(),
-          options = __options,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        method = __method.result(),
+        options = __options,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
index a77555537..ef1c93111 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala
@@ -83,6 +83,7 @@ final case class ServiceOptions(
 
 object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.ServiceOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -122,7 +123,7 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
           case 264 =>
             __deprecated = Option(_input__.readBool())
           case 7994 =>
-            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance)
+            __uninterpretedOption += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -134,9 +135,9 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.ServiceOptions = {
       com.google.protobuf.descriptor.ServiceOptions(
-          deprecated = __deprecated,
-          uninterpretedOption = __uninterpretedOption.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        deprecated = __deprecated,
+        uninterpretedOption = __uninterpretedOption.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
index b6b213bdc..411616535 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala
@@ -109,6 +109,7 @@ final case class SourceCodeInfo(
 
 object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -146,7 +147,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance)
+            __location += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.SourceCodeInfo.Location](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -158,8 +159,8 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
     }
     def result(): com.google.protobuf.descriptor.SourceCodeInfo = {
       com.google.protobuf.descriptor.SourceCodeInfo(
-          location = __location.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        location = __location.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -386,6 +387,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
   
   object Location extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo.Location] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -462,12 +464,12 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto
       }
       def result(): com.google.protobuf.descriptor.SourceCodeInfo.Location = {
         com.google.protobuf.descriptor.SourceCodeInfo.Location(
-            path = __path.result(),
-            span = __span.result(),
-            leadingComments = __leadingComments,
-            trailingComments = __trailingComments,
-            leadingDetachedComments = __leadingDetachedComments.result(),
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          path = __path.result(),
+          span = __span.result(),
+          leadingComments = __leadingComments,
+          trailingComments = __trailingComments,
+          leadingDetachedComments = __leadingDetachedComments.result(),
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
index c3f7608a5..0a90f2a6c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala
@@ -156,6 +156,7 @@ final case class UninterpretedOption(
 
 object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -211,7 +212,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
         _tag__ match {
           case 0 => _done__ = true
           case 18 =>
-            __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance)
+            __name += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.descriptor.UninterpretedOption.NamePart](_input__)
           case 26 =>
             __identifierValue = Option(_input__.readStringRequireUtf8())
           case 32 =>
@@ -235,14 +236,14 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
     }
     def result(): com.google.protobuf.descriptor.UninterpretedOption = {
       com.google.protobuf.descriptor.UninterpretedOption(
-          name = __name.result(),
-          identifierValue = __identifierValue,
-          positiveIntValue = __positiveIntValue,
-          negativeIntValue = __negativeIntValue,
-          doubleValue = __doubleValue,
-          stringValue = __stringValue,
-          aggregateValue = __aggregateValue,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name.result(),
+        identifierValue = __identifierValue,
+        positiveIntValue = __positiveIntValue,
+        negativeIntValue = __negativeIntValue,
+        doubleValue = __doubleValue,
+        stringValue = __stringValue,
+        aggregateValue = __aggregateValue,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -343,6 +344,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
   
   object NamePart extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption.NamePart] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -392,9 +394,9 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.
       def result(): com.google.protobuf.descriptor.UninterpretedOption.NamePart = {
         if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } 
         com.google.protobuf.descriptor.UninterpretedOption.NamePart(
-            namePart = __namePart,
-            isExtension = __isExtension,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          namePart = __namePart,
+          isExtension = __isExtension,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
index f227a71a4..72e81d1b6 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala
@@ -155,6 +155,7 @@ final case class Duration(
 
 object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.DurationCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.DurationCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.duration.Duration] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -200,9 +201,9 @@ object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.du
     }
     def result(): com.google.protobuf.duration.Duration = {
       com.google.protobuf.duration.Duration(
-          seconds = __seconds,
-          nanos = __nanos,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        seconds = __seconds,
+        nanos = __nanos,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
index ed42acfb1..a6158b973 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala
@@ -47,6 +47,7 @@ final case class Empty(
 
 object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.empty.Empty, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.empty.Empty] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -82,7 +83,7 @@ object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty
     }
     def result(): com.google.protobuf.empty.Empty = {
       com.google.protobuf.empty.Empty(
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
index c29a03bc0..a5bfee980 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala
@@ -262,6 +262,7 @@ final case class FieldMask(
 
 object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.field_mask.FieldMask, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.field_mask.FieldMask] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -302,8 +303,8 @@ object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.f
     }
     def result(): com.google.protobuf.field_mask.FieldMask = {
       com.google.protobuf.field_mask.FieldMask(
-          paths = __paths.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        paths = __paths.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
index 9ad2a6f6e..298be8d54 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala
@@ -71,6 +71,7 @@ final case class SourceContext(
 
 object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.source_context.SourceContext, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.source_context.SourceContext] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protob
     }
     def result(): com.google.protobuf.source_context.SourceContext = {
       com.google.protobuf.source_context.SourceContext(
-          fileName = __fileName,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fileName = __fileName,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
index ddeaf31db..26010f2a8 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala
@@ -68,6 +68,7 @@ final case class ListValue(
 
 object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.struct.ListValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.ListValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -102,7 +103,7 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance)
+            __values += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Value](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -114,8 +115,8 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s
     }
     def result(): com.google.protobuf.struct.ListValue = {
       com.google.protobuf.struct.ListValue(
-          values = __values.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        values = __values.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
index b53012059..b67ce923c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala
@@ -73,6 +73,7 @@ final case class Struct(
 
 object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.struct.Struct, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -110,7 +111,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
         _tag__ match {
           case 0 => _done__ = true
           case 10 =>
-            __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance))
+            __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Struct.FieldsEntry](_input__))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -122,8 +123,8 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
     }
     def result(): com.google.protobuf.struct.Struct = {
       com.google.protobuf.struct.Struct(
-          fields = __fields.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        fields = __fields.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -214,6 +215,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
   
   object FieldsEntry extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder.merge(input).result
     def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct.FieldsEntry] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -253,7 +255,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
             case 10 =>
               __key = _input__.readStringRequireUtf8()
             case 18 =>
-              __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance)))
+              __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Value](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -265,9 +267,9 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru
       }
       def result(): com.google.protobuf.struct.Struct.FieldsEntry = {
         com.google.protobuf.struct.Struct.FieldsEntry(
-            key = __key,
-            value = __value,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          key = __key,
+          value = __value,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala
index f64a1cfb2..8501df81f 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala
@@ -130,6 +130,7 @@ final case class Value(
 
 object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.struct.Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Value] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -183,9 +184,9 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc
           case 32 =>
             __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool())
           case 42 =>
-            __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance)))
+            __kind = com.google.protobuf.struct.Value.Kind.StructValue(__kind.structValue.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.Struct](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 50 =>
-            __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance)))
+            __kind = com.google.protobuf.struct.Value.Kind.ListValue(__kind.listValue.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.struct.ListValue](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -197,8 +198,8 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc
     }
     def result(): com.google.protobuf.struct.Value = {
       com.google.protobuf.struct.Value(
-          kind = __kind,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        kind = __kind,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
index d5f062369..604663748 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala
@@ -175,6 +175,7 @@ final case class Timestamp(
 
 object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.TimestampCompanionMethods {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.TimestampCompanionMethods = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.timestamp.Timestamp, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.timestamp.Timestamp] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -220,9 +221,9 @@ object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.t
     }
     def result(): com.google.protobuf.timestamp.Timestamp = {
       com.google.protobuf.timestamp.Timestamp(
-          seconds = __seconds,
-          nanos = __nanos,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        seconds = __seconds,
+        nanos = __nanos,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala
index e29c7c060..9540be53c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala
@@ -147,6 +147,7 @@ final case class Enum(
 
 object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.`type`.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Enum] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -201,11 +202,11 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance)
+            __enumvalue += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.EnumValue](_input__)
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 34 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 40 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -219,12 +220,12 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
     }
     def result(): com.google.protobuf.`type`.Enum = {
       com.google.protobuf.`type`.Enum(
-          name = __name,
-          enumvalue = __enumvalue.result(),
-          options = __options.result(),
-          sourceContext = __sourceContext,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        enumvalue = __enumvalue.result(),
+        options = __options.result(),
+        sourceContext = __sourceContext,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
index 1934fb194..eb84ec4cb 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala
@@ -110,6 +110,7 @@ final case class EnumValue(
 
 object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.`type`.EnumValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.EnumValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -154,7 +155,7 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`
           case 16 =>
             __number = _input__.readInt32()
           case 26 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -166,10 +167,10 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`
     }
     def result(): com.google.protobuf.`type`.EnumValue = {
       com.google.protobuf.`type`.EnumValue(
-          name = __name,
-          number = __number,
-          options = __options.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        number = __number,
+        options = __options.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala
index 1505cc57a..b3d6c060d 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala
@@ -266,6 +266,7 @@ final case class Field(
 
 object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.`type`.Field, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Field] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -346,7 +347,7 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type
           case 64 =>
             __packed = _input__.readBool()
           case 74 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 82 =>
             __jsonName = _input__.readStringRequireUtf8()
           case 90 =>
@@ -362,17 +363,17 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type
     }
     def result(): com.google.protobuf.`type`.Field = {
       com.google.protobuf.`type`.Field(
-          kind = __kind,
-          cardinality = __cardinality,
-          number = __number,
-          name = __name,
-          typeUrl = __typeUrl,
-          oneofIndex = __oneofIndex,
-          packed = __packed,
-          options = __options.result(),
-          jsonName = __jsonName,
-          defaultValue = __defaultValue,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        kind = __kind,
+        cardinality = __cardinality,
+        number = __number,
+        name = __name,
+        typeUrl = __typeUrl,
+        oneofIndex = __oneofIndex,
+        packed = __packed,
+        options = __options.result(),
+        jsonName = __jsonName,
+        defaultValue = __defaultValue,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
index 7b7bdf27a..ffd1790dc 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala
@@ -94,6 +94,7 @@ final case class OptionProto(
 
 object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.`type`.OptionProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.OptionProto] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -133,7 +134,7 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance)))
+            __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.any.Any](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case tag =>
             if (_unknownFields__ == null) {
               _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -145,9 +146,9 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.`type`.OptionProto = {
       com.google.protobuf.`type`.OptionProto(
-          name = __name,
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala
index 545db5298..f766d44c9 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala
@@ -164,6 +164,7 @@ final case class Type(
 
 object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.`type`.Type, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Type] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -221,13 +222,13 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
           case 10 =>
             __name = _input__.readStringRequireUtf8()
           case 18 =>
-            __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance)
+            __fields += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.Field](_input__)
           case 26 =>
             __oneofs += _input__.readStringRequireUtf8()
           case 34 =>
-            __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance)
+            __options += _root_.scalapb.LiteParser.readMessage[com.google.protobuf.`type`.OptionProto](_input__)
           case 42 =>
-            __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance)))
+            __sourceContext = Option(__sourceContext.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.source_context.SourceContext](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 48 =>
             __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum())
           case tag =>
@@ -241,13 +242,13 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`
     }
     def result(): com.google.protobuf.`type`.Type = {
       com.google.protobuf.`type`.Type(
-          name = __name,
-          fields = __fields.result(),
-          oneofs = __oneofs.result(),
-          options = __options.result(),
-          sourceContext = __sourceContext,
-          syntax = __syntax,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        name = __name,
+        fields = __fields.result(),
+        oneofs = __oneofs.result(),
+        options = __options.result(),
+        sourceContext = __sourceContext,
+        syntax = __syntax,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
index 769347386..ef93e6d7c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala
@@ -71,6 +71,7 @@ final case class BoolValue(
 
 object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.BoolValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BoolValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.w
     }
     def result(): com.google.protobuf.wrappers.BoolValue = {
       com.google.protobuf.wrappers.BoolValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
index 161cdf158..87dd2cdaf 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala
@@ -71,6 +71,7 @@ final case class BytesValue(
 
 object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.BytesValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BytesValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.BytesValue = {
       com.google.protobuf.wrappers.BytesValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
index 498483f8e..2ceecd430 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala
@@ -71,6 +71,7 @@ final case class DoubleValue(
 
 object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.DoubleValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.DoubleValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.DoubleValue = {
       com.google.protobuf.wrappers.DoubleValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
index f66c181b9..fa3a6f64c 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala
@@ -71,6 +71,7 @@ final case class FloatValue(
 
 object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.FloatValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.FloatValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.FloatValue = {
       com.google.protobuf.wrappers.FloatValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
index 5c5f76014..3128a4d52 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala
@@ -71,6 +71,7 @@ final case class Int32Value(
 
 object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.Int32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int32Value] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.Int32Value = {
       com.google.protobuf.wrappers.Int32Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
index 5f50666d0..396df4084 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala
@@ -71,6 +71,7 @@ final case class Int64Value(
 
 object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.Int64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int64Value] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.
     }
     def result(): com.google.protobuf.wrappers.Int64Value = {
       com.google.protobuf.wrappers.Int64Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
index 5d56dc653..8c01e63c2 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala
@@ -71,6 +71,7 @@ final case class StringValue(
 
 object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.StringValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.StringValue] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.StringValue = {
       com.google.protobuf.wrappers.StringValue(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
index ebf7246dc..73d5bad87 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala
@@ -71,6 +71,7 @@ final case class UInt32Value(
 
 object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.UInt32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt32Value] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.UInt32Value = {
       com.google.protobuf.wrappers.UInt32Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
index 2bf931018..0f5237aa0 100644
--- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
+++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala
@@ -71,6 +71,7 @@ final case class UInt64Value(
 
 object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = newBuilder.merge(input).result
   def merge(`_message__`: com.google.protobuf.wrappers.UInt64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt64Value] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -111,8 +112,8 @@ object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf
     }
     def result(): com.google.protobuf.wrappers.UInt64Value = {
       com.google.protobuf.wrappers.UInt64Value(
-          value = __value,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        value = __value,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/Collection.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/Collection.scala
index 432f126dc..26c530716 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/Collection.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/Collection.scala
@@ -99,6 +99,7 @@ final case class Collection(
 
 object Collection extends scalapb.GeneratedMessageCompanion[scalapb.options.Collection] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.Collection] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.Collection = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.Collection, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.Collection = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.Collection] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -149,10 +150,10 @@ object Collection extends scalapb.GeneratedMessageCompanion[scalapb.options.Coll
     }
     def result(): scalapb.options.Collection = {
       scalapb.options.Collection(
-          `type` = __type,
-          nonEmpty = __nonEmpty,
-          adapter = __adapter,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `type` = __type,
+        nonEmpty = __nonEmpty,
+        adapter = __adapter,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala
index 8ba092d9a..0790aa9b4 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala
@@ -96,6 +96,7 @@ final case class EnumOptions(
 
 object EnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.EnumOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.EnumOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.EnumOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -146,10 +147,10 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.Enu
     }
     def result(): scalapb.options.EnumOptions = {
       scalapb.options.EnumOptions(
-          `extends` = __extends.result(),
-          companionExtends = __companionExtends.result(),
-          `type` = __type,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `extends` = __extends.result(),
+        companionExtends = __companionExtends.result(),
+        `type` = __type,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala
index ada05ffb3..2b50cb03d 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala
@@ -78,6 +78,7 @@ final case class EnumValueOptions(
 
 object EnumValueOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.EnumValueOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.EnumValueOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumValueOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumValueOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.EnumValueOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -123,9 +124,9 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[scalapb.option
     }
     def result(): scalapb.options.EnumValueOptions = {
       scalapb.options.EnumValueOptions(
-          `extends` = __extends.result(),
-          scalaName = __scalaName,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `extends` = __extends.result(),
+        scalaName = __scalaName,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala
index 93c3091ac..6989eb539 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala
@@ -189,6 +189,7 @@ final case class FieldOptions(
 
 object FieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.FieldOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.FieldOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.FieldOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.FieldOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.FieldOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -253,7 +254,7 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.Fi
           case 26 =>
             __collectionType = Option(_input__.readStringRequireUtf8())
           case 66 =>
-            __collection = Option(_root_.scalapb.LiteParser.readMessage(_input__, __collection.getOrElse(scalapb.options.Collection.defaultInstance)))
+            __collection = Option(__collection.fold(_root_.scalapb.LiteParser.readMessage[scalapb.options.Collection](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
           case 34 =>
             __keyType = Option(_input__.readStringRequireUtf8())
           case 42 =>
@@ -275,16 +276,16 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.Fi
     }
     def result(): scalapb.options.FieldOptions = {
       scalapb.options.FieldOptions(
-          `type` = __type,
-          scalaName = __scalaName,
-          collectionType = __collectionType,
-          collection = __collection,
-          keyType = __keyType,
-          valueType = __valueType,
-          annotations = __annotations.result(),
-          mapType = __mapType,
-          noBox = __noBox,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `type` = __type,
+        scalaName = __scalaName,
+        collectionType = __collectionType,
+        collection = __collection,
+        keyType = __keyType,
+        valueType = __valueType,
+        annotations = __annotations.result(),
+        mapType = __mapType,
+        noBox = __noBox,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala
index 48d224e47..a44d0142c 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala
@@ -181,6 +181,7 @@ final case class MessageOptions(
 
 object MessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.MessageOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.MessageOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.MessageOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.MessageOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.MessageOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -256,15 +257,15 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
     }
     def result(): scalapb.options.MessageOptions = {
       scalapb.options.MessageOptions(
-          `extends` = __extends.result(),
-          companionExtends = __companionExtends.result(),
-          annotations = __annotations.result(),
-          `type` = __type,
-          companionAnnotations = __companionAnnotations.result(),
-          sealedOneofExtends = __sealedOneofExtends.result(),
-          noBox = __noBox,
-          unknownFieldsAnnotations = __unknownFieldsAnnotations.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `extends` = __extends.result(),
+        companionExtends = __companionExtends.result(),
+        annotations = __annotations.result(),
+        `type` = __type,
+        companionAnnotations = __companionAnnotations.result(),
+        sealedOneofExtends = __sealedOneofExtends.result(),
+        noBox = __noBox,
+        unknownFieldsAnnotations = __unknownFieldsAnnotations.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala
index 84d91968c..97785f5b5 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala
@@ -62,6 +62,7 @@ final case class OneofOptions(
 
 object OneofOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.OneofOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.OneofOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.OneofOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.OneofOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.OneofOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -102,8 +103,8 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.On
     }
     def result(): scalapb.options.OneofOptions = {
       scalapb.options.OneofOptions(
-          `extends` = __extends.result(),
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        `extends` = __extends.result(),
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala
index e291fae1a..c70d7c3c4 100644
--- a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala
+++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala
@@ -428,6 +428,7 @@ final case class ScalaPbOptions(
 
 object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions] {
   implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions] = this
+  override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions = newBuilder.merge(input).result
   def merge(`_message__`: scalapb.options.ScalaPbOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions = newBuilder(_message__).merge(_input__).result()
   implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions] = _root_.scalapb.descriptors.Reads{
     case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -571,11 +572,11 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
           case 136 =>
             __enumStripPrefix = Option(_input__.readBool())
           case 146 =>
-            __auxMessageOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxMessageOptions.defaultInstance)
+            __auxMessageOptions += _root_.scalapb.LiteParser.readMessage[scalapb.options.ScalaPbOptions.AuxMessageOptions](_input__)
           case 154 =>
-            __auxFieldOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxFieldOptions.defaultInstance)
+            __auxFieldOptions += _root_.scalapb.LiteParser.readMessage[scalapb.options.ScalaPbOptions.AuxFieldOptions](_input__)
           case 162 =>
-            __auxEnumOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxEnumOptions.defaultInstance)
+            __auxEnumOptions += _root_.scalapb.LiteParser.readMessage[scalapb.options.ScalaPbOptions.AuxEnumOptions](_input__)
           case 170 =>
             __bytesType = Option(_input__.readStringRequireUtf8())
           case 8008 =>
@@ -591,29 +592,29 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
     }
     def result(): scalapb.options.ScalaPbOptions = {
       scalapb.options.ScalaPbOptions(
-          packageName = __packageName,
-          flatPackage = __flatPackage,
-          `import` = __import.result(),
-          preamble = __preamble.result(),
-          singleFile = __singleFile,
-          noPrimitiveWrappers = __noPrimitiveWrappers,
-          primitiveWrappers = __primitiveWrappers,
-          collectionType = __collectionType,
-          preserveUnknownFields = __preserveUnknownFields,
-          objectName = __objectName,
-          scope = __scope,
-          lenses = __lenses,
-          retainSourceCodeInfo = __retainSourceCodeInfo,
-          mapType = __mapType,
-          noDefaultValuesInConstructor = __noDefaultValuesInConstructor,
-          enumValueNaming = __enumValueNaming,
-          enumStripPrefix = __enumStripPrefix,
-          auxMessageOptions = __auxMessageOptions.result(),
-          auxFieldOptions = __auxFieldOptions.result(),
-          auxEnumOptions = __auxEnumOptions.result(),
-          bytesType = __bytesType,
-          testOnlyNoJavaConversions = __testOnlyNoJavaConversions,
-          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+        packageName = __packageName,
+        flatPackage = __flatPackage,
+        `import` = __import.result(),
+        preamble = __preamble.result(),
+        singleFile = __singleFile,
+        noPrimitiveWrappers = __noPrimitiveWrappers,
+        primitiveWrappers = __primitiveWrappers,
+        collectionType = __collectionType,
+        preserveUnknownFields = __preserveUnknownFields,
+        objectName = __objectName,
+        scope = __scope,
+        lenses = __lenses,
+        retainSourceCodeInfo = __retainSourceCodeInfo,
+        mapType = __mapType,
+        noDefaultValuesInConstructor = __noDefaultValuesInConstructor,
+        enumValueNaming = __enumValueNaming,
+        enumStripPrefix = __enumStripPrefix,
+        auxMessageOptions = __auxMessageOptions.result(),
+        auxFieldOptions = __auxFieldOptions.result(),
+        auxEnumOptions = __auxEnumOptions.result(),
+        bytesType = __bytesType,
+        testOnlyNoJavaConversions = __testOnlyNoJavaConversions,
+        unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
       )
     }
   }
@@ -836,6 +837,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
   
   object AuxMessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxMessageOptions] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxMessageOptions] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxMessageOptions = newBuilder.merge(input).result
     def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxMessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxMessageOptions = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxMessageOptions] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -875,7 +877,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
             case 10 =>
               __target = Option(_input__.readStringRequireUtf8())
             case 18 =>
-              __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.MessageOptions.defaultInstance)))
+              __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[scalapb.options.MessageOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -887,9 +889,9 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
       }
       def result(): scalapb.options.ScalaPbOptions.AuxMessageOptions = {
         scalapb.options.ScalaPbOptions.AuxMessageOptions(
-            target = __target,
-            options = __options,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          target = __target,
+          options = __options,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
@@ -1004,6 +1006,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
   
   object AuxFieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxFieldOptions] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxFieldOptions] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxFieldOptions = newBuilder.merge(input).result
     def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxFieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxFieldOptions = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxFieldOptions] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -1043,7 +1046,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
             case 10 =>
               __target = Option(_input__.readStringRequireUtf8())
             case 18 =>
-              __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.FieldOptions.defaultInstance)))
+              __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[scalapb.options.FieldOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -1055,9 +1058,9 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
       }
       def result(): scalapb.options.ScalaPbOptions.AuxFieldOptions = {
         scalapb.options.ScalaPbOptions.AuxFieldOptions(
-            target = __target,
-            options = __options,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          target = __target,
+          options = __options,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }
@@ -1172,6 +1175,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
   
   object AuxEnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxEnumOptions] {
     implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxEnumOptions] = this
+    override def parseFrom(input: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxEnumOptions = newBuilder.merge(input).result
     def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxEnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxEnumOptions = newBuilder(_message__).merge(_input__).result()
     implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxEnumOptions] = _root_.scalapb.descriptors.Reads{
       case _root_.scalapb.descriptors.PMessage(__fieldsMap) =>
@@ -1211,7 +1215,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
             case 10 =>
               __target = Option(_input__.readStringRequireUtf8())
             case 18 =>
-              __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.EnumOptions.defaultInstance)))
+              __options = Option(__options.fold(_root_.scalapb.LiteParser.readMessage[scalapb.options.EnumOptions](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _)))
             case tag =>
               if (_unknownFields__ == null) {
                 _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder()
@@ -1223,9 +1227,9 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.
       }
       def result(): scalapb.options.ScalaPbOptions.AuxEnumOptions = {
         scalapb.options.ScalaPbOptions.AuxEnumOptions(
-            target = __target,
-            options = __options,
-            unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
+          target = __target,
+          options = __options,
+          unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()
         )
       }
     }