diff --git a/lib/src/gen/app/v1/app.pb.dart b/lib/src/gen/app/v1/app.pb.dart
index 922e56696e..72b3d5ad95 100644
--- a/lib/src/gen/app/v1/app.pb.dart
+++ b/lib/src/gen/app/v1/app.pb.dart
@@ -2197,6 +2197,600 @@ class DeleteOrganizationMemberResponse extends $pb.GeneratedMessage {
   static DeleteOrganizationMemberResponse? _defaultInstance;
 }
 
+class BillingAddress extends $pb.GeneratedMessage {
+  factory BillingAddress({
+    $core.String? addressLine1,
+    $core.String? addressLine2,
+    $core.String? city,
+    $core.String? state,
+    $core.String? zipcode,
+  }) {
+    final $result = create();
+    if (addressLine1 != null) {
+      $result.addressLine1 = addressLine1;
+    }
+    if (addressLine2 != null) {
+      $result.addressLine2 = addressLine2;
+    }
+    if (city != null) {
+      $result.city = city;
+    }
+    if (state != null) {
+      $result.state = state;
+    }
+    if (zipcode != null) {
+      $result.zipcode = zipcode;
+    }
+    return $result;
+  }
+  BillingAddress._() : super();
+  factory BillingAddress.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory BillingAddress.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'BillingAddress', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'addressLine1', protoName: 'address_line_1')
+    ..aOS(2, _omitFieldNames ? '' : 'addressLine2', protoName: 'address_line_2')
+    ..aOS(3, _omitFieldNames ? '' : 'city')
+    ..aOS(4, _omitFieldNames ? '' : 'state')
+    ..aOS(5, _omitFieldNames ? '' : 'zipcode')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  BillingAddress clone() => BillingAddress()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  BillingAddress copyWith(void Function(BillingAddress) updates) => super.copyWith((message) => updates(message as BillingAddress)) as BillingAddress;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static BillingAddress create() => BillingAddress._();
+  BillingAddress createEmptyInstance() => create();
+  static $pb.PbList<BillingAddress> createRepeated() => $pb.PbList<BillingAddress>();
+  @$core.pragma('dart2js:noInline')
+  static BillingAddress getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<BillingAddress>(create);
+  static BillingAddress? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get addressLine1 => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set addressLine1($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasAddressLine1() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearAddressLine1() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get addressLine2 => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set addressLine2($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasAddressLine2() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearAddressLine2() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get city => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set city($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasCity() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearCity() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get state => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set state($core.String v) { $_setString(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasState() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearState() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.String get zipcode => $_getSZ(4);
+  @$pb.TagNumber(5)
+  set zipcode($core.String v) { $_setString(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasZipcode() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearZipcode() => clearField(5);
+}
+
+class EnableBillingServiceRequest extends $pb.GeneratedMessage {
+  factory EnableBillingServiceRequest({
+    $core.String? orgId,
+    BillingAddress? billingAddress,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    if (billingAddress != null) {
+      $result.billingAddress = billingAddress;
+    }
+    return $result;
+  }
+  EnableBillingServiceRequest._() : super();
+  factory EnableBillingServiceRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory EnableBillingServiceRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EnableBillingServiceRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..aOM<BillingAddress>(2, _omitFieldNames ? '' : 'billingAddress', subBuilder: BillingAddress.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  EnableBillingServiceRequest clone() => EnableBillingServiceRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  EnableBillingServiceRequest copyWith(void Function(EnableBillingServiceRequest) updates) => super.copyWith((message) => updates(message as EnableBillingServiceRequest)) as EnableBillingServiceRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EnableBillingServiceRequest create() => EnableBillingServiceRequest._();
+  EnableBillingServiceRequest createEmptyInstance() => create();
+  static $pb.PbList<EnableBillingServiceRequest> createRepeated() => $pb.PbList<EnableBillingServiceRequest>();
+  @$core.pragma('dart2js:noInline')
+  static EnableBillingServiceRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EnableBillingServiceRequest>(create);
+  static EnableBillingServiceRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  BillingAddress get billingAddress => $_getN(1);
+  @$pb.TagNumber(2)
+  set billingAddress(BillingAddress v) { setField(2, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasBillingAddress() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearBillingAddress() => clearField(2);
+  @$pb.TagNumber(2)
+  BillingAddress ensureBillingAddress() => $_ensure(1);
+}
+
+class EnableBillingServiceResponse extends $pb.GeneratedMessage {
+  factory EnableBillingServiceResponse() => create();
+  EnableBillingServiceResponse._() : super();
+  factory EnableBillingServiceResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory EnableBillingServiceResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EnableBillingServiceResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  EnableBillingServiceResponse clone() => EnableBillingServiceResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  EnableBillingServiceResponse copyWith(void Function(EnableBillingServiceResponse) updates) => super.copyWith((message) => updates(message as EnableBillingServiceResponse)) as EnableBillingServiceResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EnableBillingServiceResponse create() => EnableBillingServiceResponse._();
+  EnableBillingServiceResponse createEmptyInstance() => create();
+  static $pb.PbList<EnableBillingServiceResponse> createRepeated() => $pb.PbList<EnableBillingServiceResponse>();
+  @$core.pragma('dart2js:noInline')
+  static EnableBillingServiceResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EnableBillingServiceResponse>(create);
+  static EnableBillingServiceResponse? _defaultInstance;
+}
+
+class UpdateBillingServiceRequest extends $pb.GeneratedMessage {
+  factory UpdateBillingServiceRequest({
+    $core.String? orgId,
+    BillingAddress? billingAddress,
+    $core.String? billingSupportEmail,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    if (billingAddress != null) {
+      $result.billingAddress = billingAddress;
+    }
+    if (billingSupportEmail != null) {
+      $result.billingSupportEmail = billingSupportEmail;
+    }
+    return $result;
+  }
+  UpdateBillingServiceRequest._() : super();
+  factory UpdateBillingServiceRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateBillingServiceRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateBillingServiceRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..aOM<BillingAddress>(2, _omitFieldNames ? '' : 'billingAddress', subBuilder: BillingAddress.create)
+    ..aOS(3, _omitFieldNames ? '' : 'billingSupportEmail')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  UpdateBillingServiceRequest clone() => UpdateBillingServiceRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  UpdateBillingServiceRequest copyWith(void Function(UpdateBillingServiceRequest) updates) => super.copyWith((message) => updates(message as UpdateBillingServiceRequest)) as UpdateBillingServiceRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UpdateBillingServiceRequest create() => UpdateBillingServiceRequest._();
+  UpdateBillingServiceRequest createEmptyInstance() => create();
+  static $pb.PbList<UpdateBillingServiceRequest> createRepeated() => $pb.PbList<UpdateBillingServiceRequest>();
+  @$core.pragma('dart2js:noInline')
+  static UpdateBillingServiceRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateBillingServiceRequest>(create);
+  static UpdateBillingServiceRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  BillingAddress get billingAddress => $_getN(1);
+  @$pb.TagNumber(2)
+  set billingAddress(BillingAddress v) { setField(2, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasBillingAddress() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearBillingAddress() => clearField(2);
+  @$pb.TagNumber(2)
+  BillingAddress ensureBillingAddress() => $_ensure(1);
+
+  @$pb.TagNumber(3)
+  $core.String get billingSupportEmail => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set billingSupportEmail($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasBillingSupportEmail() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearBillingSupportEmail() => clearField(3);
+}
+
+class UpdateBillingServiceResponse extends $pb.GeneratedMessage {
+  factory UpdateBillingServiceResponse() => create();
+  UpdateBillingServiceResponse._() : super();
+  factory UpdateBillingServiceResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateBillingServiceResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateBillingServiceResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  UpdateBillingServiceResponse clone() => UpdateBillingServiceResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  UpdateBillingServiceResponse copyWith(void Function(UpdateBillingServiceResponse) updates) => super.copyWith((message) => updates(message as UpdateBillingServiceResponse)) as UpdateBillingServiceResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UpdateBillingServiceResponse create() => UpdateBillingServiceResponse._();
+  UpdateBillingServiceResponse createEmptyInstance() => create();
+  static $pb.PbList<UpdateBillingServiceResponse> createRepeated() => $pb.PbList<UpdateBillingServiceResponse>();
+  @$core.pragma('dart2js:noInline')
+  static UpdateBillingServiceResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateBillingServiceResponse>(create);
+  static UpdateBillingServiceResponse? _defaultInstance;
+}
+
+class DisableBillingServiceRequest extends $pb.GeneratedMessage {
+  factory DisableBillingServiceRequest({
+    $core.String? orgId,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    return $result;
+  }
+  DisableBillingServiceRequest._() : super();
+  factory DisableBillingServiceRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DisableBillingServiceRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DisableBillingServiceRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  DisableBillingServiceRequest clone() => DisableBillingServiceRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  DisableBillingServiceRequest copyWith(void Function(DisableBillingServiceRequest) updates) => super.copyWith((message) => updates(message as DisableBillingServiceRequest)) as DisableBillingServiceRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DisableBillingServiceRequest create() => DisableBillingServiceRequest._();
+  DisableBillingServiceRequest createEmptyInstance() => create();
+  static $pb.PbList<DisableBillingServiceRequest> createRepeated() => $pb.PbList<DisableBillingServiceRequest>();
+  @$core.pragma('dart2js:noInline')
+  static DisableBillingServiceRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DisableBillingServiceRequest>(create);
+  static DisableBillingServiceRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
+}
+
+class DisableBillingServiceResponse extends $pb.GeneratedMessage {
+  factory DisableBillingServiceResponse() => create();
+  DisableBillingServiceResponse._() : super();
+  factory DisableBillingServiceResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DisableBillingServiceResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DisableBillingServiceResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  DisableBillingServiceResponse clone() => DisableBillingServiceResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  DisableBillingServiceResponse copyWith(void Function(DisableBillingServiceResponse) updates) => super.copyWith((message) => updates(message as DisableBillingServiceResponse)) as DisableBillingServiceResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DisableBillingServiceResponse create() => DisableBillingServiceResponse._();
+  DisableBillingServiceResponse createEmptyInstance() => create();
+  static $pb.PbList<DisableBillingServiceResponse> createRepeated() => $pb.PbList<DisableBillingServiceResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DisableBillingServiceResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DisableBillingServiceResponse>(create);
+  static DisableBillingServiceResponse? _defaultInstance;
+}
+
+class OrganizationSetSupportEmailRequest extends $pb.GeneratedMessage {
+  factory OrganizationSetSupportEmailRequest({
+    $core.String? orgId,
+    $core.String? email,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    if (email != null) {
+      $result.email = email;
+    }
+    return $result;
+  }
+  OrganizationSetSupportEmailRequest._() : super();
+  factory OrganizationSetSupportEmailRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OrganizationSetSupportEmailRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OrganizationSetSupportEmailRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..aOS(2, _omitFieldNames ? '' : 'email')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  OrganizationSetSupportEmailRequest clone() => OrganizationSetSupportEmailRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  OrganizationSetSupportEmailRequest copyWith(void Function(OrganizationSetSupportEmailRequest) updates) => super.copyWith((message) => updates(message as OrganizationSetSupportEmailRequest)) as OrganizationSetSupportEmailRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static OrganizationSetSupportEmailRequest create() => OrganizationSetSupportEmailRequest._();
+  OrganizationSetSupportEmailRequest createEmptyInstance() => create();
+  static $pb.PbList<OrganizationSetSupportEmailRequest> createRepeated() => $pb.PbList<OrganizationSetSupportEmailRequest>();
+  @$core.pragma('dart2js:noInline')
+  static OrganizationSetSupportEmailRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OrganizationSetSupportEmailRequest>(create);
+  static OrganizationSetSupportEmailRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get email => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set email($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasEmail() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearEmail() => clearField(2);
+}
+
+class OrganizationSetSupportEmailResponse extends $pb.GeneratedMessage {
+  factory OrganizationSetSupportEmailResponse() => create();
+  OrganizationSetSupportEmailResponse._() : super();
+  factory OrganizationSetSupportEmailResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OrganizationSetSupportEmailResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OrganizationSetSupportEmailResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  OrganizationSetSupportEmailResponse clone() => OrganizationSetSupportEmailResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  OrganizationSetSupportEmailResponse copyWith(void Function(OrganizationSetSupportEmailResponse) updates) => super.copyWith((message) => updates(message as OrganizationSetSupportEmailResponse)) as OrganizationSetSupportEmailResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static OrganizationSetSupportEmailResponse create() => OrganizationSetSupportEmailResponse._();
+  OrganizationSetSupportEmailResponse createEmptyInstance() => create();
+  static $pb.PbList<OrganizationSetSupportEmailResponse> createRepeated() => $pb.PbList<OrganizationSetSupportEmailResponse>();
+  @$core.pragma('dart2js:noInline')
+  static OrganizationSetSupportEmailResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OrganizationSetSupportEmailResponse>(create);
+  static OrganizationSetSupportEmailResponse? _defaultInstance;
+}
+
+class OrganizationGetSupportEmailRequest extends $pb.GeneratedMessage {
+  factory OrganizationGetSupportEmailRequest({
+    $core.String? orgId,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    return $result;
+  }
+  OrganizationGetSupportEmailRequest._() : super();
+  factory OrganizationGetSupportEmailRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OrganizationGetSupportEmailRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OrganizationGetSupportEmailRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  OrganizationGetSupportEmailRequest clone() => OrganizationGetSupportEmailRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  OrganizationGetSupportEmailRequest copyWith(void Function(OrganizationGetSupportEmailRequest) updates) => super.copyWith((message) => updates(message as OrganizationGetSupportEmailRequest)) as OrganizationGetSupportEmailRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static OrganizationGetSupportEmailRequest create() => OrganizationGetSupportEmailRequest._();
+  OrganizationGetSupportEmailRequest createEmptyInstance() => create();
+  static $pb.PbList<OrganizationGetSupportEmailRequest> createRepeated() => $pb.PbList<OrganizationGetSupportEmailRequest>();
+  @$core.pragma('dart2js:noInline')
+  static OrganizationGetSupportEmailRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OrganizationGetSupportEmailRequest>(create);
+  static OrganizationGetSupportEmailRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
+}
+
+class OrganizationGetSupportEmailResponse extends $pb.GeneratedMessage {
+  factory OrganizationGetSupportEmailResponse({
+    $core.String? email,
+  }) {
+    final $result = create();
+    if (email != null) {
+      $result.email = email;
+    }
+    return $result;
+  }
+  OrganizationGetSupportEmailResponse._() : super();
+  factory OrganizationGetSupportEmailResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OrganizationGetSupportEmailResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OrganizationGetSupportEmailResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'email')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  OrganizationGetSupportEmailResponse clone() => OrganizationGetSupportEmailResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  OrganizationGetSupportEmailResponse copyWith(void Function(OrganizationGetSupportEmailResponse) updates) => super.copyWith((message) => updates(message as OrganizationGetSupportEmailResponse)) as OrganizationGetSupportEmailResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static OrganizationGetSupportEmailResponse create() => OrganizationGetSupportEmailResponse._();
+  OrganizationGetSupportEmailResponse createEmptyInstance() => create();
+  static $pb.PbList<OrganizationGetSupportEmailResponse> createRepeated() => $pb.PbList<OrganizationGetSupportEmailResponse>();
+  @$core.pragma('dart2js:noInline')
+  static OrganizationGetSupportEmailResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OrganizationGetSupportEmailResponse>(create);
+  static OrganizationGetSupportEmailResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get email => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set email($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasEmail() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearEmail() => clearField(1);
+}
+
 /// Used for rendering an organization's information on the frontend (limited
 /// to id, name, or both).
 class OrganizationIdentity extends $pb.GeneratedMessage {
@@ -5643,6 +6237,158 @@ class FragmentHistoryEntry extends $pb.GeneratedMessage {
   AuthenticatorInfo ensureEditedBy() => $_ensure(3);
 }
 
+class FragmentError extends $pb.GeneratedMessage {
+  factory FragmentError({
+    FragmentErrorType? errorType,
+    $core.String? fragmentId,
+    $core.String? detail,
+  }) {
+    final $result = create();
+    if (errorType != null) {
+      $result.errorType = errorType;
+    }
+    if (fragmentId != null) {
+      $result.fragmentId = fragmentId;
+    }
+    if (detail != null) {
+      $result.detail = detail;
+    }
+    return $result;
+  }
+  FragmentError._() : super();
+  factory FragmentError.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory FragmentError.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'FragmentError', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..e<FragmentErrorType>(1, _omitFieldNames ? '' : 'errorType', $pb.PbFieldType.OE, defaultOrMaker: FragmentErrorType.FRAGMENT_ERROR_TYPE_UNSPECIFIED, valueOf: FragmentErrorType.valueOf, enumValues: FragmentErrorType.values)
+    ..aOS(2, _omitFieldNames ? '' : 'fragmentId')
+    ..aOS(3, _omitFieldNames ? '' : 'detail')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  FragmentError clone() => FragmentError()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  FragmentError copyWith(void Function(FragmentError) updates) => super.copyWith((message) => updates(message as FragmentError)) as FragmentError;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static FragmentError create() => FragmentError._();
+  FragmentError createEmptyInstance() => create();
+  static $pb.PbList<FragmentError> createRepeated() => $pb.PbList<FragmentError>();
+  @$core.pragma('dart2js:noInline')
+  static FragmentError getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<FragmentError>(create);
+  static FragmentError? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  FragmentErrorType get errorType => $_getN(0);
+  @$pb.TagNumber(1)
+  set errorType(FragmentErrorType v) { setField(1, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasErrorType() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearErrorType() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get fragmentId => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set fragmentId($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasFragmentId() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearFragmentId() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get detail => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set detail($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasDetail() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearDetail() => clearField(3);
+}
+
+class FragmentTree extends $pb.GeneratedMessage {
+  factory FragmentTree({
+    $core.String? rootFragmentId,
+    $core.Iterable<$core.String>? fragmentMergeOrder,
+    FragmentError? error,
+  }) {
+    final $result = create();
+    if (rootFragmentId != null) {
+      $result.rootFragmentId = rootFragmentId;
+    }
+    if (fragmentMergeOrder != null) {
+      $result.fragmentMergeOrder.addAll(fragmentMergeOrder);
+    }
+    if (error != null) {
+      $result.error = error;
+    }
+    return $result;
+  }
+  FragmentTree._() : super();
+  factory FragmentTree.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory FragmentTree.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'FragmentTree', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'rootFragmentId')
+    ..pPS(2, _omitFieldNames ? '' : 'fragmentMergeOrder')
+    ..aOM<FragmentError>(3, _omitFieldNames ? '' : 'error', subBuilder: FragmentError.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  FragmentTree clone() => FragmentTree()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  FragmentTree copyWith(void Function(FragmentTree) updates) => super.copyWith((message) => updates(message as FragmentTree)) as FragmentTree;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static FragmentTree create() => FragmentTree._();
+  FragmentTree createEmptyInstance() => create();
+  static $pb.PbList<FragmentTree> createRepeated() => $pb.PbList<FragmentTree>();
+  @$core.pragma('dart2js:noInline')
+  static FragmentTree getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<FragmentTree>(create);
+  static FragmentTree? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get rootFragmentId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set rootFragmentId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasRootFragmentId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearRootFragmentId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.List<$core.String> get fragmentMergeOrder => $_getList(1);
+
+  @$pb.TagNumber(3)
+  FragmentError get error => $_getN(2);
+  @$pb.TagNumber(3)
+  set error(FragmentError v) { setField(3, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasError() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearError() => clearField(3);
+  @$pb.TagNumber(3)
+  FragmentError ensureError() => $_ensure(2);
+}
+
 class ListFragmentsRequest extends $pb.GeneratedMessage {
   factory ListFragmentsRequest({
     $core.String? organizationId,
@@ -6500,11 +7246,15 @@ class ListMachineFragmentsRequest extends $pb.GeneratedMessage {
 class ListMachineFragmentsResponse extends $pb.GeneratedMessage {
   factory ListMachineFragmentsResponse({
     $core.Iterable<Fragment>? fragments,
+    $core.Iterable<FragmentTree>? fragmentTrees,
   }) {
     final $result = create();
     if (fragments != null) {
       $result.fragments.addAll(fragments);
     }
+    if (fragmentTrees != null) {
+      $result.fragmentTrees.addAll(fragmentTrees);
+    }
     return $result;
   }
   ListMachineFragmentsResponse._() : super();
@@ -6513,6 +7263,7 @@ class ListMachineFragmentsResponse extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListMachineFragmentsResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
     ..pc<Fragment>(1, _omitFieldNames ? '' : 'fragments', $pb.PbFieldType.PM, subBuilder: Fragment.create)
+    ..pc<FragmentTree>(2, _omitFieldNames ? '' : 'fragmentTrees', $pb.PbFieldType.PM, subBuilder: FragmentTree.create)
     ..hasRequiredFields = false
   ;
 
@@ -6539,6 +7290,9 @@ class ListMachineFragmentsResponse extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(1)
   $core.List<Fragment> get fragments => $_getList(0);
+
+  @$pb.TagNumber(2)
+  $core.List<FragmentTree> get fragmentTrees => $_getList(1);
 }
 
 class ListRobotsResponse extends $pb.GeneratedMessage {
diff --git a/lib/src/gen/app/v1/app.pbenum.dart b/lib/src/gen/app/v1/app.pbenum.dart
index a6ae6861d7..07d05bf8c2 100644
--- a/lib/src/gen/app/v1/app.pbenum.dart
+++ b/lib/src/gen/app/v1/app.pbenum.dart
@@ -53,6 +53,27 @@ class FragmentVisibility extends $pb.ProtobufEnum {
   const FragmentVisibility._($core.int v, $core.String n) : super(v, n);
 }
 
+class FragmentErrorType extends $pb.ProtobufEnum {
+  static const FragmentErrorType FRAGMENT_ERROR_TYPE_UNSPECIFIED = FragmentErrorType._(0, _omitEnumNames ? '' : 'FRAGMENT_ERROR_TYPE_UNSPECIFIED');
+  static const FragmentErrorType FRAGMENT_ERROR_TYPE_NO_ACCESS = FragmentErrorType._(1, _omitEnumNames ? '' : 'FRAGMENT_ERROR_TYPE_NO_ACCESS');
+  static const FragmentErrorType FRAGMENT_ERROR_TYPE_NESTING_LIMIT_EXCEEDED = FragmentErrorType._(2, _omitEnumNames ? '' : 'FRAGMENT_ERROR_TYPE_NESTING_LIMIT_EXCEEDED');
+  static const FragmentErrorType FRAGMENT_ERROR_TYPE_CHILD_ID_INVALID = FragmentErrorType._(3, _omitEnumNames ? '' : 'FRAGMENT_ERROR_TYPE_CHILD_ID_INVALID');
+  static const FragmentErrorType FRAGMENT_ERROR_TYPE_CYCLE_DETECTED = FragmentErrorType._(4, _omitEnumNames ? '' : 'FRAGMENT_ERROR_TYPE_CYCLE_DETECTED');
+
+  static const $core.List<FragmentErrorType> values = <FragmentErrorType> [
+    FRAGMENT_ERROR_TYPE_UNSPECIFIED,
+    FRAGMENT_ERROR_TYPE_NO_ACCESS,
+    FRAGMENT_ERROR_TYPE_NESTING_LIMIT_EXCEEDED,
+    FRAGMENT_ERROR_TYPE_CHILD_ID_INVALID,
+    FRAGMENT_ERROR_TYPE_CYCLE_DETECTED,
+  ];
+
+  static final $core.Map<$core.int, FragmentErrorType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static FragmentErrorType? valueOf($core.int value) => _byValue[value];
+
+  const FragmentErrorType._($core.int v, $core.String n) : super(v, n);
+}
+
 class RegistryItemStatus extends $pb.ProtobufEnum {
   static const RegistryItemStatus REGISTRY_ITEM_STATUS_UNSPECIFIED = RegistryItemStatus._(0, _omitEnumNames ? '' : 'REGISTRY_ITEM_STATUS_UNSPECIFIED');
   static const RegistryItemStatus REGISTRY_ITEM_STATUS_PUBLISHED = RegistryItemStatus._(1, _omitEnumNames ? '' : 'REGISTRY_ITEM_STATUS_PUBLISHED');
diff --git a/lib/src/gen/app/v1/app.pbgrpc.dart b/lib/src/gen/app/v1/app.pbgrpc.dart
index cb289960f7..79a7aaec30 100644
--- a/lib/src/gen/app/v1/app.pbgrpc.dart
+++ b/lib/src/gen/app/v1/app.pbgrpc.dart
@@ -81,6 +81,26 @@ class AppServiceClient extends $grpc.Client {
       '/viam.app.v1.AppService/ResendOrganizationInvite',
       ($9.ResendOrganizationInviteRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $9.ResendOrganizationInviteResponse.fromBuffer(value));
+  static final _$enableBillingService = $grpc.ClientMethod<$9.EnableBillingServiceRequest, $9.EnableBillingServiceResponse>(
+      '/viam.app.v1.AppService/EnableBillingService',
+      ($9.EnableBillingServiceRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.EnableBillingServiceResponse.fromBuffer(value));
+  static final _$disableBillingService = $grpc.ClientMethod<$9.DisableBillingServiceRequest, $9.DisableBillingServiceResponse>(
+      '/viam.app.v1.AppService/DisableBillingService',
+      ($9.DisableBillingServiceRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.DisableBillingServiceResponse.fromBuffer(value));
+  static final _$updateBillingService = $grpc.ClientMethod<$9.UpdateBillingServiceRequest, $9.UpdateBillingServiceResponse>(
+      '/viam.app.v1.AppService/UpdateBillingService',
+      ($9.UpdateBillingServiceRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.UpdateBillingServiceResponse.fromBuffer(value));
+  static final _$organizationSetSupportEmail = $grpc.ClientMethod<$9.OrganizationSetSupportEmailRequest, $9.OrganizationSetSupportEmailResponse>(
+      '/viam.app.v1.AppService/OrganizationSetSupportEmail',
+      ($9.OrganizationSetSupportEmailRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.OrganizationSetSupportEmailResponse.fromBuffer(value));
+  static final _$organizationGetSupportEmail = $grpc.ClientMethod<$9.OrganizationGetSupportEmailRequest, $9.OrganizationGetSupportEmailResponse>(
+      '/viam.app.v1.AppService/OrganizationGetSupportEmail',
+      ($9.OrganizationGetSupportEmailRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.OrganizationGetSupportEmailResponse.fromBuffer(value));
   static final _$createLocation = $grpc.ClientMethod<$9.CreateLocationRequest, $9.CreateLocationResponse>(
       '/viam.app.v1.AppService/CreateLocation',
       ($9.CreateLocationRequest value) => value.writeToBuffer(),
@@ -380,6 +400,26 @@ class AppServiceClient extends $grpc.Client {
     return $createUnaryCall(_$resendOrganizationInvite, request, options: options);
   }
 
+  $grpc.ResponseFuture<$9.EnableBillingServiceResponse> enableBillingService($9.EnableBillingServiceRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$enableBillingService, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$9.DisableBillingServiceResponse> disableBillingService($9.DisableBillingServiceRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$disableBillingService, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$9.UpdateBillingServiceResponse> updateBillingService($9.UpdateBillingServiceRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$updateBillingService, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$9.OrganizationSetSupportEmailResponse> organizationSetSupportEmail($9.OrganizationSetSupportEmailRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$organizationSetSupportEmail, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$9.OrganizationGetSupportEmailResponse> organizationGetSupportEmail($9.OrganizationGetSupportEmailRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$organizationGetSupportEmail, request, options: options);
+  }
+
   $grpc.ResponseFuture<$9.CreateLocationResponse> createLocation($9.CreateLocationRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$createLocation, request, options: options);
   }
@@ -723,6 +763,41 @@ abstract class AppServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $9.ResendOrganizationInviteRequest.fromBuffer(value),
         ($9.ResendOrganizationInviteResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$9.EnableBillingServiceRequest, $9.EnableBillingServiceResponse>(
+        'EnableBillingService',
+        enableBillingService_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $9.EnableBillingServiceRequest.fromBuffer(value),
+        ($9.EnableBillingServiceResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$9.DisableBillingServiceRequest, $9.DisableBillingServiceResponse>(
+        'DisableBillingService',
+        disableBillingService_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $9.DisableBillingServiceRequest.fromBuffer(value),
+        ($9.DisableBillingServiceResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$9.UpdateBillingServiceRequest, $9.UpdateBillingServiceResponse>(
+        'UpdateBillingService',
+        updateBillingService_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $9.UpdateBillingServiceRequest.fromBuffer(value),
+        ($9.UpdateBillingServiceResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$9.OrganizationSetSupportEmailRequest, $9.OrganizationSetSupportEmailResponse>(
+        'OrganizationSetSupportEmail',
+        organizationSetSupportEmail_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $9.OrganizationSetSupportEmailRequest.fromBuffer(value),
+        ($9.OrganizationSetSupportEmailResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$9.OrganizationGetSupportEmailRequest, $9.OrganizationGetSupportEmailResponse>(
+        'OrganizationGetSupportEmail',
+        organizationGetSupportEmail_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $9.OrganizationGetSupportEmailRequest.fromBuffer(value),
+        ($9.OrganizationGetSupportEmailResponse value) => value.writeToBuffer()));
     $addMethod($grpc.ServiceMethod<$9.CreateLocationRequest, $9.CreateLocationResponse>(
         'CreateLocation',
         createLocation_Pre,
@@ -1191,6 +1266,26 @@ abstract class AppServiceBase extends $grpc.Service {
     return resendOrganizationInvite(call, await request);
   }
 
+  $async.Future<$9.EnableBillingServiceResponse> enableBillingService_Pre($grpc.ServiceCall call, $async.Future<$9.EnableBillingServiceRequest> request) async {
+    return enableBillingService(call, await request);
+  }
+
+  $async.Future<$9.DisableBillingServiceResponse> disableBillingService_Pre($grpc.ServiceCall call, $async.Future<$9.DisableBillingServiceRequest> request) async {
+    return disableBillingService(call, await request);
+  }
+
+  $async.Future<$9.UpdateBillingServiceResponse> updateBillingService_Pre($grpc.ServiceCall call, $async.Future<$9.UpdateBillingServiceRequest> request) async {
+    return updateBillingService(call, await request);
+  }
+
+  $async.Future<$9.OrganizationSetSupportEmailResponse> organizationSetSupportEmail_Pre($grpc.ServiceCall call, $async.Future<$9.OrganizationSetSupportEmailRequest> request) async {
+    return organizationSetSupportEmail(call, await request);
+  }
+
+  $async.Future<$9.OrganizationGetSupportEmailResponse> organizationGetSupportEmail_Pre($grpc.ServiceCall call, $async.Future<$9.OrganizationGetSupportEmailRequest> request) async {
+    return organizationGetSupportEmail(call, await request);
+  }
+
   $async.Future<$9.CreateLocationResponse> createLocation_Pre($grpc.ServiceCall call, $async.Future<$9.CreateLocationRequest> request) async {
     return createLocation(call, await request);
   }
@@ -1434,6 +1529,11 @@ abstract class AppServiceBase extends $grpc.Service {
   $async.Future<$9.DeleteOrganizationMemberResponse> deleteOrganizationMember($grpc.ServiceCall call, $9.DeleteOrganizationMemberRequest request);
   $async.Future<$9.DeleteOrganizationInviteResponse> deleteOrganizationInvite($grpc.ServiceCall call, $9.DeleteOrganizationInviteRequest request);
   $async.Future<$9.ResendOrganizationInviteResponse> resendOrganizationInvite($grpc.ServiceCall call, $9.ResendOrganizationInviteRequest request);
+  $async.Future<$9.EnableBillingServiceResponse> enableBillingService($grpc.ServiceCall call, $9.EnableBillingServiceRequest request);
+  $async.Future<$9.DisableBillingServiceResponse> disableBillingService($grpc.ServiceCall call, $9.DisableBillingServiceRequest request);
+  $async.Future<$9.UpdateBillingServiceResponse> updateBillingService($grpc.ServiceCall call, $9.UpdateBillingServiceRequest request);
+  $async.Future<$9.OrganizationSetSupportEmailResponse> organizationSetSupportEmail($grpc.ServiceCall call, $9.OrganizationSetSupportEmailRequest request);
+  $async.Future<$9.OrganizationGetSupportEmailResponse> organizationGetSupportEmail($grpc.ServiceCall call, $9.OrganizationGetSupportEmailRequest request);
   $async.Future<$9.CreateLocationResponse> createLocation($grpc.ServiceCall call, $9.CreateLocationRequest request);
   $async.Future<$9.GetLocationResponse> getLocation($grpc.ServiceCall call, $9.GetLocationRequest request);
   $async.Future<$9.UpdateLocationResponse> updateLocation($grpc.ServiceCall call, $9.UpdateLocationRequest request);
diff --git a/lib/src/gen/app/v1/app.pbjson.dart b/lib/src/gen/app/v1/app.pbjson.dart
index 2f62b083e6..99fd264445 100644
--- a/lib/src/gen/app/v1/app.pbjson.dart
+++ b/lib/src/gen/app/v1/app.pbjson.dart
@@ -49,6 +49,25 @@ final $typed_data.Uint8List fragmentVisibilityDescriptor = $convert.base64Decode
     'AAEh8KG0ZSQUdNRU5UX1ZJU0lCSUxJVFlfUFJJVkFURRABEh4KGkZSQUdNRU5UX1ZJU0lCSUxJ'
     'VFlfUFVCTElDEAISJwojRlJBR01FTlRfVklTSUJJTElUWV9QVUJMSUNfVU5MSVNURUQQAw==');
 
+@$core.Deprecated('Use fragmentErrorTypeDescriptor instead')
+const FragmentErrorType$json = {
+  '1': 'FragmentErrorType',
+  '2': [
+    {'1': 'FRAGMENT_ERROR_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'FRAGMENT_ERROR_TYPE_NO_ACCESS', '2': 1},
+    {'1': 'FRAGMENT_ERROR_TYPE_NESTING_LIMIT_EXCEEDED', '2': 2},
+    {'1': 'FRAGMENT_ERROR_TYPE_CHILD_ID_INVALID', '2': 3},
+    {'1': 'FRAGMENT_ERROR_TYPE_CYCLE_DETECTED', '2': 4},
+  ],
+};
+
+/// Descriptor for `FragmentErrorType`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List fragmentErrorTypeDescriptor = $convert.base64Decode(
+    'ChFGcmFnbWVudEVycm9yVHlwZRIjCh9GUkFHTUVOVF9FUlJPUl9UWVBFX1VOU1BFQ0lGSUVEEA'
+    'ASIQodRlJBR01FTlRfRVJST1JfVFlQRV9OT19BQ0NFU1MQARIuCipGUkFHTUVOVF9FUlJPUl9U'
+    'WVBFX05FU1RJTkdfTElNSVRfRVhDRUVERUQQAhIoCiRGUkFHTUVOVF9FUlJPUl9UWVBFX0NISU'
+    'xEX0lEX0lOVkFMSUQQAxImCiJGUkFHTUVOVF9FUlJPUl9UWVBFX0NZQ0xFX0RFVEVDVEVEEAQ=');
+
 @$core.Deprecated('Use registryItemStatusDescriptor instead')
 const RegistryItemStatus$json = {
   '1': 'RegistryItemStatus',
@@ -579,6 +598,148 @@ const DeleteOrganizationMemberResponse$json = {
 final $typed_data.Uint8List deleteOrganizationMemberResponseDescriptor = $convert.base64Decode(
     'CiBEZWxldGVPcmdhbml6YXRpb25NZW1iZXJSZXNwb25zZQ==');
 
+@$core.Deprecated('Use billingAddressDescriptor instead')
+const BillingAddress$json = {
+  '1': 'BillingAddress',
+  '2': [
+    {'1': 'address_line_1', '3': 1, '4': 1, '5': 9, '10': 'addressLine1'},
+    {'1': 'address_line_2', '3': 2, '4': 1, '5': 9, '9': 0, '10': 'addressLine2', '17': true},
+    {'1': 'city', '3': 3, '4': 1, '5': 9, '10': 'city'},
+    {'1': 'state', '3': 4, '4': 1, '5': 9, '10': 'state'},
+    {'1': 'zipcode', '3': 5, '4': 1, '5': 9, '10': 'zipcode'},
+  ],
+  '8': [
+    {'1': '_address_line_2'},
+  ],
+};
+
+/// Descriptor for `BillingAddress`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List billingAddressDescriptor = $convert.base64Decode(
+    'Cg5CaWxsaW5nQWRkcmVzcxIkCg5hZGRyZXNzX2xpbmVfMRgBIAEoCVIMYWRkcmVzc0xpbmUxEi'
+    'kKDmFkZHJlc3NfbGluZV8yGAIgASgJSABSDGFkZHJlc3NMaW5lMogBARISCgRjaXR5GAMgASgJ'
+    'UgRjaXR5EhQKBXN0YXRlGAQgASgJUgVzdGF0ZRIYCgd6aXBjb2RlGAUgASgJUgd6aXBjb2RlQh'
+    'EKD19hZGRyZXNzX2xpbmVfMg==');
+
+@$core.Deprecated('Use enableBillingServiceRequestDescriptor instead')
+const EnableBillingServiceRequest$json = {
+  '1': 'EnableBillingServiceRequest',
+  '2': [
+    {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'},
+    {'1': 'billing_address', '3': 2, '4': 1, '5': 11, '6': '.viam.app.v1.BillingAddress', '10': 'billingAddress'},
+  ],
+};
+
+/// Descriptor for `EnableBillingServiceRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List enableBillingServiceRequestDescriptor = $convert.base64Decode(
+    'ChtFbmFibGVCaWxsaW5nU2VydmljZVJlcXVlc3QSFQoGb3JnX2lkGAEgASgJUgVvcmdJZBJECg'
+    '9iaWxsaW5nX2FkZHJlc3MYAiABKAsyGy52aWFtLmFwcC52MS5CaWxsaW5nQWRkcmVzc1IOYmls'
+    'bGluZ0FkZHJlc3M=');
+
+@$core.Deprecated('Use enableBillingServiceResponseDescriptor instead')
+const EnableBillingServiceResponse$json = {
+  '1': 'EnableBillingServiceResponse',
+};
+
+/// Descriptor for `EnableBillingServiceResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List enableBillingServiceResponseDescriptor = $convert.base64Decode(
+    'ChxFbmFibGVCaWxsaW5nU2VydmljZVJlc3BvbnNl');
+
+@$core.Deprecated('Use updateBillingServiceRequestDescriptor instead')
+const UpdateBillingServiceRequest$json = {
+  '1': 'UpdateBillingServiceRequest',
+  '2': [
+    {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'},
+    {'1': 'billing_address', '3': 2, '4': 1, '5': 11, '6': '.viam.app.v1.BillingAddress', '10': 'billingAddress'},
+    {'1': 'billing_support_email', '3': 3, '4': 1, '5': 9, '10': 'billingSupportEmail'},
+  ],
+};
+
+/// Descriptor for `UpdateBillingServiceRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List updateBillingServiceRequestDescriptor = $convert.base64Decode(
+    'ChtVcGRhdGVCaWxsaW5nU2VydmljZVJlcXVlc3QSFQoGb3JnX2lkGAEgASgJUgVvcmdJZBJECg'
+    '9iaWxsaW5nX2FkZHJlc3MYAiABKAsyGy52aWFtLmFwcC52MS5CaWxsaW5nQWRkcmVzc1IOYmls'
+    'bGluZ0FkZHJlc3MSMgoVYmlsbGluZ19zdXBwb3J0X2VtYWlsGAMgASgJUhNiaWxsaW5nU3VwcG'
+    '9ydEVtYWls');
+
+@$core.Deprecated('Use updateBillingServiceResponseDescriptor instead')
+const UpdateBillingServiceResponse$json = {
+  '1': 'UpdateBillingServiceResponse',
+};
+
+/// Descriptor for `UpdateBillingServiceResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List updateBillingServiceResponseDescriptor = $convert.base64Decode(
+    'ChxVcGRhdGVCaWxsaW5nU2VydmljZVJlc3BvbnNl');
+
+@$core.Deprecated('Use disableBillingServiceRequestDescriptor instead')
+const DisableBillingServiceRequest$json = {
+  '1': 'DisableBillingServiceRequest',
+  '2': [
+    {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'},
+  ],
+};
+
+/// Descriptor for `DisableBillingServiceRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List disableBillingServiceRequestDescriptor = $convert.base64Decode(
+    'ChxEaXNhYmxlQmlsbGluZ1NlcnZpY2VSZXF1ZXN0EhUKBm9yZ19pZBgBIAEoCVIFb3JnSWQ=');
+
+@$core.Deprecated('Use disableBillingServiceResponseDescriptor instead')
+const DisableBillingServiceResponse$json = {
+  '1': 'DisableBillingServiceResponse',
+};
+
+/// Descriptor for `DisableBillingServiceResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List disableBillingServiceResponseDescriptor = $convert.base64Decode(
+    'Ch1EaXNhYmxlQmlsbGluZ1NlcnZpY2VSZXNwb25zZQ==');
+
+@$core.Deprecated('Use organizationSetSupportEmailRequestDescriptor instead')
+const OrganizationSetSupportEmailRequest$json = {
+  '1': 'OrganizationSetSupportEmailRequest',
+  '2': [
+    {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'},
+    {'1': 'email', '3': 2, '4': 1, '5': 9, '10': 'email'},
+  ],
+};
+
+/// Descriptor for `OrganizationSetSupportEmailRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List organizationSetSupportEmailRequestDescriptor = $convert.base64Decode(
+    'CiJPcmdhbml6YXRpb25TZXRTdXBwb3J0RW1haWxSZXF1ZXN0EhUKBm9yZ19pZBgBIAEoCVIFb3'
+    'JnSWQSFAoFZW1haWwYAiABKAlSBWVtYWls');
+
+@$core.Deprecated('Use organizationSetSupportEmailResponseDescriptor instead')
+const OrganizationSetSupportEmailResponse$json = {
+  '1': 'OrganizationSetSupportEmailResponse',
+};
+
+/// Descriptor for `OrganizationSetSupportEmailResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List organizationSetSupportEmailResponseDescriptor = $convert.base64Decode(
+    'CiNPcmdhbml6YXRpb25TZXRTdXBwb3J0RW1haWxSZXNwb25zZQ==');
+
+@$core.Deprecated('Use organizationGetSupportEmailRequestDescriptor instead')
+const OrganizationGetSupportEmailRequest$json = {
+  '1': 'OrganizationGetSupportEmailRequest',
+  '2': [
+    {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'},
+  ],
+};
+
+/// Descriptor for `OrganizationGetSupportEmailRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List organizationGetSupportEmailRequestDescriptor = $convert.base64Decode(
+    'CiJPcmdhbml6YXRpb25HZXRTdXBwb3J0RW1haWxSZXF1ZXN0EhUKBm9yZ19pZBgBIAEoCVIFb3'
+    'JnSWQ=');
+
+@$core.Deprecated('Use organizationGetSupportEmailResponseDescriptor instead')
+const OrganizationGetSupportEmailResponse$json = {
+  '1': 'OrganizationGetSupportEmailResponse',
+  '2': [
+    {'1': 'email', '3': 1, '4': 1, '5': 9, '10': 'email'},
+  ],
+};
+
+/// Descriptor for `OrganizationGetSupportEmailResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List organizationGetSupportEmailResponseDescriptor = $convert.base64Decode(
+    'CiNPcmdhbml6YXRpb25HZXRTdXBwb3J0RW1haWxSZXNwb25zZRIUCgVlbWFpbBgBIAEoCVIFZW'
+    '1haWw=');
+
 @$core.Deprecated('Use organizationIdentityDescriptor instead')
 const OrganizationIdentity$json = {
   '1': 'OrganizationIdentity',
@@ -1394,6 +1555,38 @@ final $typed_data.Uint8List fragmentHistoryEntryDescriptor = $convert.base64Deco
     'lhbS5hcHAudjEuQXV0aGVudGljYXRvckluZm9CJpqEngMhYnNvbjoiZWRpdGVkX2J5IiBqc29u'
     'OiJlZGl0ZWRfYnkiUghlZGl0ZWRCeQ==');
 
+@$core.Deprecated('Use fragmentErrorDescriptor instead')
+const FragmentError$json = {
+  '1': 'FragmentError',
+  '2': [
+    {'1': 'error_type', '3': 1, '4': 1, '5': 14, '6': '.viam.app.v1.FragmentErrorType', '10': 'errorType'},
+    {'1': 'fragment_id', '3': 2, '4': 1, '5': 9, '10': 'fragmentId'},
+    {'1': 'detail', '3': 3, '4': 1, '5': 9, '10': 'detail'},
+  ],
+};
+
+/// Descriptor for `FragmentError`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List fragmentErrorDescriptor = $convert.base64Decode(
+    'Cg1GcmFnbWVudEVycm9yEj0KCmVycm9yX3R5cGUYASABKA4yHi52aWFtLmFwcC52MS5GcmFnbW'
+    'VudEVycm9yVHlwZVIJZXJyb3JUeXBlEh8KC2ZyYWdtZW50X2lkGAIgASgJUgpmcmFnbWVudElk'
+    'EhYKBmRldGFpbBgDIAEoCVIGZGV0YWls');
+
+@$core.Deprecated('Use fragmentTreeDescriptor instead')
+const FragmentTree$json = {
+  '1': 'FragmentTree',
+  '2': [
+    {'1': 'root_fragment_id', '3': 1, '4': 1, '5': 9, '10': 'rootFragmentId'},
+    {'1': 'fragment_merge_order', '3': 2, '4': 3, '5': 9, '10': 'fragmentMergeOrder'},
+    {'1': 'error', '3': 3, '4': 1, '5': 11, '6': '.viam.app.v1.FragmentError', '10': 'error'},
+  ],
+};
+
+/// Descriptor for `FragmentTree`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List fragmentTreeDescriptor = $convert.base64Decode(
+    'CgxGcmFnbWVudFRyZWUSKAoQcm9vdF9mcmFnbWVudF9pZBgBIAEoCVIOcm9vdEZyYWdtZW50SW'
+    'QSMAoUZnJhZ21lbnRfbWVyZ2Vfb3JkZXIYAiADKAlSEmZyYWdtZW50TWVyZ2VPcmRlchIwCgVl'
+    'cnJvchgDIAEoCzIaLnZpYW0uYXBwLnYxLkZyYWdtZW50RXJyb3JSBWVycm9y');
+
 @$core.Deprecated('Use listFragmentsRequestDescriptor instead')
 const ListFragmentsRequest$json = {
   '1': 'ListFragmentsRequest',
@@ -1608,13 +1801,15 @@ const ListMachineFragmentsResponse$json = {
   '1': 'ListMachineFragmentsResponse',
   '2': [
     {'1': 'fragments', '3': 1, '4': 3, '5': 11, '6': '.viam.app.v1.Fragment', '10': 'fragments'},
+    {'1': 'fragment_trees', '3': 2, '4': 3, '5': 11, '6': '.viam.app.v1.FragmentTree', '10': 'fragmentTrees'},
   ],
 };
 
 /// Descriptor for `ListMachineFragmentsResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List listMachineFragmentsResponseDescriptor = $convert.base64Decode(
     'ChxMaXN0TWFjaGluZUZyYWdtZW50c1Jlc3BvbnNlEjMKCWZyYWdtZW50cxgBIAMoCzIVLnZpYW'
-    '0uYXBwLnYxLkZyYWdtZW50UglmcmFnbWVudHM=');
+    '0uYXBwLnYxLkZyYWdtZW50UglmcmFnbWVudHMSQAoOZnJhZ21lbnRfdHJlZXMYAiADKAsyGS52'
+    'aWFtLmFwcC52MS5GcmFnbWVudFRyZWVSDWZyYWdtZW50VHJlZXM=');
 
 @$core.Deprecated('Use listRobotsResponseDescriptor instead')
 const ListRobotsResponse$json = {
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 083ce9e71f..240b42a9af 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -94,7 +94,7 @@ grpc_duration.Duration durationToProto(Duration duration) {
 
 String getVersionMetadata() {
   const String sdkVersion = 'v0.0.24';
-  const String apiTag = 'v0.1.352';
+  const String apiTag = 'v0.1.354';
 
   return 'flutter;$sdkVersion;$apiTag';
 }