intermediate changes

ref:2cf7b068367f584737d54e38e21e004dde93c1d2

58 files changed, 2329 insertions, 553 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index 06ce997224a..1fb8d71ae8c 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -320,6 +320,8 @@ add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/algorithm)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/functional)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle)
@@ -329,10 +331,8 @@ add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/algorithm)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/functional)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/utility)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format)
 add_subdirectory(contrib/libs/grpc/third_party/address_sorting)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index ca1e352eea0..fed3f05544e 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -400,6 +400,8 @@ add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/algorithm)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/functional)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle)
@@ -409,10 +411,8 @@ add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/algorithm)
-add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/functional)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types)
+add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/utility)
 add_subdirectory(contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format)
 add_subdirectory(contrib/libs/grpc/third_party/address_sorting)
diff --git a/contrib/libs/grpc/grpc++/CMakeLists.txt b/contrib/libs/grpc/grpc++/CMakeLists.txt
index bbaa168b306..ebbc9493ed6 100644
--- a/contrib/libs/grpc/grpc++/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc++/CMakeLists.txt
@@ -29,13 +29,13 @@ target_link_libraries(libs-grpc-grpc++ PUBLIC
   grpc-third_party-address_sorting
   grpc-third_party-upb
   OpenSSL::OpenSSL
-  ycontainer-internal-raw_hash_set
-  yabseil-cpp-tstring-y_absl-hash
-  yabseil-cpp-tstring-y_absl-status
-  yabsl-status-statusor
-  yabseil-cpp-tstring-y_absl-strings
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabseil-cpp-tstring-y_absl-time
+  container-internal-raw_hash_set
+  abseil-cpp-tstring-y_absl-hash
+  abseil-cpp-tstring-y_absl-status
+  y_absl-status-statusor
+  abseil-cpp-tstring-y_absl-strings
+  abseil-cpp-tstring-y_absl-synchronization
+  abseil-cpp-tstring-y_absl-time
 )
 target_sources(libs-grpc-grpc++ PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/core/ext/transport/binder/client/binder_connector.cc
diff --git a/contrib/libs/grpc/grpc/CMakeLists.txt b/contrib/libs/grpc/grpc/CMakeLists.txt
index 2c4440df146..69b1ea1aadb 100644
--- a/contrib/libs/grpc/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc/CMakeLists.txt
@@ -40,16 +40,16 @@ target_link_libraries(libs-grpc-grpc PUBLIC
   contrib-libs-re2
   contrib-libs-xxhash
   ZLIB::ZLIB
-  yabseil-cpp-tstring-y_absl-hash
+  abseil-cpp-tstring-y_absl-hash
   abseil-cpp-tstring-y_absl-meta
-  yabseil-cpp-tstring-y_absl-status
-  yabsl-status-statusor
-  yabseil-cpp-tstring-y_absl-strings
-  yabsl-strings-cord
-  ystrings-internal-str_format
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-status
+  y_absl-status-statusor
+  abseil-cpp-tstring-y_absl-strings
+  y_absl-strings-cord
+  strings-internal-str_format
+  abseil-cpp-tstring-y_absl-synchronization
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-time_zone
   library-cpp-resource
 )
 target_sources(libs-grpc-grpc PRIVATE
diff --git a/contrib/libs/grpc/src/core/lib/CMakeLists.txt b/contrib/libs/grpc/src/core/lib/CMakeLists.txt
index cb22364dc35..251abc26115 100644
--- a/contrib/libs/grpc/src/core/lib/CMakeLists.txt
+++ b/contrib/libs/grpc/src/core/lib/CMakeLists.txt
@@ -24,15 +24,15 @@ target_link_libraries(src-core-lib PUBLIC
   contrib-libs-cxxsupp
   yutil
   grpc-third_party-upb
-  ybase-internal-spinlock_wait
+  base-internal-spinlock_wait
   abseil-cpp-tstring-y_absl-container
   abseil-cpp-tstring-y_absl-memory
-  yabseil-cpp-tstring-y_absl-status
-  yabseil-cpp-tstring-y_absl-strings
-  yabsl-strings-cord
-  ystrings-internal-str_format
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabseil-cpp-tstring-y_absl-time
+  abseil-cpp-tstring-y_absl-status
+  abseil-cpp-tstring-y_absl-strings
+  y_absl-strings-cord
+  strings-internal-str_format
+  abseil-cpp-tstring-y_absl-synchronization
+  abseil-cpp-tstring-y_absl-time
 )
 target_sources(src-core-lib PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/core/ext/upb-generated/google/protobuf/any.upb.c
diff --git a/contrib/python/boto3/py3/.dist-info/METADATA b/contrib/python/boto3/py3/.dist-info/METADATA
index a63cf6dfa48..767a92e631b 100644
--- a/contrib/python/boto3/py3/.dist-info/METADATA
+++ b/contrib/python/boto3/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boto3
-Version: 1.23.8
+Version: 1.23.9
 Summary: The AWS SDK for Python
 Home-page: https://github.com/boto/boto3
 Author: Amazon Web Services
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >= 3.6
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: botocore (<1.27.0,>=1.26.8)
+Requires-Dist: botocore (<1.27.0,>=1.26.9)
 Requires-Dist: jmespath (<2.0.0,>=0.7.1)
 Requires-Dist: s3transfer (<0.6.0,>=0.5.0)
 Provides-Extra: crt
diff --git a/contrib/python/boto3/py3/boto3/__init__.py b/contrib/python/boto3/py3/boto3/__init__.py
index 13282d6732e..9ff6abe9f0f 100644
--- a/contrib/python/boto3/py3/boto3/__init__.py
+++ b/contrib/python/boto3/py3/boto3/__init__.py
@@ -17,7 +17,7 @@ from boto3.compat import _warn_deprecated_python
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.23.8'
+__version__ = '1.23.9'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/contrib/python/botocore/py3/.dist-info/METADATA b/contrib/python/botocore/py3/.dist-info/METADATA
index 70cb5d88947..52a679689d1 100644
--- a/contrib/python/botocore/py3/.dist-info/METADATA
+++ b/contrib/python/botocore/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: botocore
-Version: 1.26.8
+Version: 1.26.9
 Summary: Low-level, data-driven core of boto 3.
 Home-page: https://github.com/boto/botocore
 Author: Amazon Web Services
diff --git a/contrib/python/botocore/py3/botocore/__init__.py b/contrib/python/botocore/py3/botocore/__init__.py
index 205c4fefbc8..00493239cd4 100644
--- a/contrib/python/botocore/py3/botocore/__init__.py
+++ b/contrib/python/botocore/py3/botocore/__init__.py
@@ -16,7 +16,7 @@ import logging
 import os
 import re
 
-__version__ = '1.26.8'
+__version__ = '1.26.9'
 
 
 class NullHandler(logging.Handler):
diff --git a/contrib/python/botocore/py3/botocore/data/ec2/2016-11-15/service-2.json b/contrib/python/botocore/py3/botocore/data/ec2/2016-11-15/service-2.json
index dcd9f58a6bd..267e8a9b1af 100644
--- a/contrib/python/botocore/py3/botocore/data/ec2/2016-11-15/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/ec2/2016-11-15/service-2.json
@@ -31185,7 +31185,18 @@
         "i4i.4xlarge",
         "i4i.8xlarge",
         "i4i.16xlarge",
-        "i4i.32xlarge"
+        "i4i.32xlarge",
+        "i4i.metal",
+        "x2idn.metal",
+        "x2iedn.metal",
+        "c7g.medium",
+        "c7g.large",
+        "c7g.xlarge",
+        "c7g.2xlarge",
+        "c7g.4xlarge",
+        "c7g.8xlarge",
+        "c7g.12xlarge",
+        "c7g.16xlarge"
       ]
     },
     "InstanceTypeHypervisor":{
diff --git a/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/paginators-1.json b/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/paginators-1.json
new file mode 100644
index 00000000000..7193d8550a8
--- /dev/null
+++ b/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/paginators-1.json
@@ -0,0 +1,16 @@
+{
+  "pagination": {
+    "ListApplications": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "applications"
+    },
+    "ListJobRuns": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "jobRuns"
+    }
+  }
+}
diff --git a/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/service-2.json b/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/service-2.json
new file mode 100644
index 00000000000..d4e777c9801
--- /dev/null
+++ b/contrib/python/botocore/py3/botocore/data/emr-serverless/2021-07-13/service-2.json
@@ -0,0 +1,1650 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2021-07-13",
+    "endpointPrefix":"emr-serverless",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"EMR Serverless Web Service",
+    "serviceId":"EMR Serverless",
+    "signatureVersion":"v4",
+    "signingName":"emr-serverless",
+    "uid":"emr-serverless-2021-07-13"
+  },
+  "operations":{
+    "CancelJobRun":{
+      "name":"CancelJobRun",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{applicationId}/jobruns/{jobRunId}",
+        "responseCode":200
+      },
+      "input":{"shape":"CancelJobRunRequest"},
+      "output":{"shape":"CancelJobRunResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Cancels a job run.</p>",
+      "idempotent":true
+    },
+    "CreateApplication":{
+      "name":"CreateApplication",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateApplicationRequest"},
+      "output":{"shape":"CreateApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Creates an application.</p>",
+      "idempotent":true
+    },
+    "DeleteApplication":{
+      "name":"DeleteApplication",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{applicationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteApplicationRequest"},
+      "output":{"shape":"DeleteApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an application. An application has to be in a stopped or created state in order to be deleted.</p>",
+      "idempotent":true
+    },
+    "GetApplication":{
+      "name":"GetApplication",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{applicationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetApplicationRequest"},
+      "output":{"shape":"GetApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Displays detailed information about a specified application.</p>"
+    },
+    "GetJobRun":{
+      "name":"GetJobRun",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{applicationId}/jobruns/{jobRunId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetJobRunRequest"},
+      "output":{"shape":"GetJobRunResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Displays detailed information about a job run.</p>"
+    },
+    "ListApplications":{
+      "name":"ListApplications",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications",
+        "responseCode":200
+      },
+      "input":{"shape":"ListApplicationsRequest"},
+      "output":{"shape":"ListApplicationsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists applications based on a set of parameters.</p>"
+    },
+    "ListJobRuns":{
+      "name":"ListJobRuns",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{applicationId}/jobruns",
+        "responseCode":200
+      },
+      "input":{"shape":"ListJobRunsRequest"},
+      "output":{"shape":"ListJobRunsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists job runs based on a set of parameters.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the tags assigned to the resources.</p>"
+    },
+    "StartApplication":{
+      "name":"StartApplication",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{applicationId}/start",
+        "responseCode":200
+      },
+      "input":{"shape":"StartApplicationRequest"},
+      "output":{"shape":"StartApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Starts a specified application and initializes initial capacity if configured.</p>",
+      "idempotent":true
+    },
+    "StartJobRun":{
+      "name":"StartJobRun",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{applicationId}/jobruns",
+        "responseCode":200
+      },
+      "input":{"shape":"StartJobRunRequest"},
+      "output":{"shape":"StartJobRunResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Starts a job run.</p>",
+      "idempotent":true
+    },
+    "StopApplication":{
+      "name":"StopApplication",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{applicationId}/stop",
+        "responseCode":200
+      },
+      "input":{"shape":"StopApplicationRequest"},
+      "output":{"shape":"StopApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Stops a specified application and releases initial capacity if configured. All scheduled and running jobs must be completed or cancelled before stopping an application.</p>",
+      "idempotent":true
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Assigns tags to resources. A tag is a label that you assign to an AWS resource. Each tag consists of a key and an optional value, both of which you define. Tags enable you to categorize your AWS resources by attributes such as purpose, owner, or environment. When you have many resources of the same type, you can quickly identify a specific resource based on the tags you've assigned to it. </p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes tags from resources.</p>",
+      "idempotent":true
+    },
+    "UpdateApplication":{
+      "name":"UpdateApplication",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/applications/{applicationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateApplicationRequest"},
+      "output":{"shape":"UpdateApplicationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates a specified application. An application has to be in a stopped or created state in order to be updated.</p>"
+    }
+  },
+  "shapes":{
+    "Application":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "arn",
+        "releaseLabel",
+        "type",
+        "state",
+        "createdAt",
+        "updatedAt"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application.</p>"
+        },
+        "name":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The name of the application.</p>"
+        },
+        "arn":{
+          "shape":"ApplicationArn",
+          "documentation":"<p>The ARN of the application.</p>"
+        },
+        "releaseLabel":{
+          "shape":"ReleaseLabel",
+          "documentation":"<p>The EMR release version associated with the application.</p>"
+        },
+        "type":{
+          "shape":"EngineType",
+          "documentation":"<p>The type of application, such as Spark or Hive.</p>"
+        },
+        "state":{
+          "shape":"ApplicationState",
+          "documentation":"<p>The state of the application.</p>"
+        },
+        "stateDetails":{
+          "shape":"String256",
+          "documentation":"<p>The state details of the application.</p>"
+        },
+        "initialCapacity":{
+          "shape":"InitialCapacityConfigMap",
+          "documentation":"<p>The initial capacity of the application.</p>"
+        },
+        "maximumCapacity":{
+          "shape":"MaximumAllowedResources",
+          "documentation":"<p>The maximum capacity of the application. This is cumulative across all workers at any given point in time during the lifespan of the application is created. No new resources will be created once any one of the defined limits is hit.</p>"
+        },
+        "createdAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the application run was created.</p>"
+        },
+        "updatedAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the application run was last updated.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags assigned to the application.</p>"
+        },
+        "autoStartConfiguration":{
+          "shape":"AutoStartConfig",
+          "documentation":"<p>The configuration for an application to automatically start on job submission.</p>"
+        },
+        "autoStopConfiguration":{
+          "shape":"AutoStopConfig",
+          "documentation":"<p>The configuration for an application to automatically stop after a certain amount of time being idle.</p>"
+        },
+        "networkConfiguration":{
+          "shape":"NetworkConfiguration",
+          "documentation":"<p>The network configuration for customer VPC connectivity for the application.</p>"
+        }
+      },
+      "documentation":"<p>Information about an application. EMR Serverless uses applications to run jobs.</p>"
+    },
+    "ApplicationArn":{
+      "type":"string",
+      "max":1024,
+      "min":60,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):emr-serverless:.+:(\\d{12}):\\/applications\\/[0-9a-zA-Z]+"
+    },
+    "ApplicationId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[0-9a-z]+"
+    },
+    "ApplicationList":{
+      "type":"list",
+      "member":{"shape":"ApplicationSummary"}
+    },
+    "ApplicationName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z0-9._/#-]+"
+    },
+    "ApplicationState":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "CREATED",
+        "STARTING",
+        "STARTED",
+        "STOPPING",
+        "STOPPED",
+        "TERMINATED"
+      ]
+    },
+    "ApplicationStateSet":{
+      "type":"list",
+      "member":{"shape":"ApplicationState"},
+      "max":7,
+      "min":1
+    },
+    "ApplicationSummary":{
+      "type":"structure",
+      "required":[
+        "id",
+        "arn",
+        "releaseLabel",
+        "type",
+        "state",
+        "createdAt",
+        "updatedAt"
+      ],
+      "members":{
+        "id":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application.</p>"
+        },
+        "name":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The name of the application.</p>"
+        },
+        "arn":{
+          "shape":"ApplicationArn",
+          "documentation":"<p>The ARN of the application.</p>"
+        },
+        "releaseLabel":{
+          "shape":"ReleaseLabel",
+          "documentation":"<p>The EMR release version associated with the application.</p>"
+        },
+        "type":{
+          "shape":"EngineType",
+          "documentation":"<p>The type of application, such as Spark or Hive.</p>"
+        },
+        "state":{
+          "shape":"ApplicationState",
+          "documentation":"<p>The state of the application.</p>"
+        },
+        "stateDetails":{
+          "shape":"String256",
+          "documentation":"<p>The state details of the application.</p>"
+        },
+        "createdAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the application was created.</p>"
+        },
+        "updatedAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the application was last updated.</p>"
+        }
+      },
+      "documentation":"<p>The summary of attributes associated with an application.</p>"
+    },
+    "AutoStartConfig":{
+      "type":"structure",
+      "members":{
+        "enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Enables the application to automatically start on job submission. Defaults to true.</p>"
+        }
+      },
+      "documentation":"<p>The configuration for an application to automatically start on job submission.</p>"
+    },
+    "AutoStopConfig":{
+      "type":"structure",
+      "members":{
+        "enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Enables the application to automatically stop after a certain amount of time being idle. Defaults to true.</p>"
+        },
+        "idleTimeoutMinutes":{
+          "shape":"AutoStopConfigIdleTimeoutMinutesInteger",
+          "documentation":"<p>The amount of idle time in minutes after which your application will automatically stop. Defaults to 15 minutes.</p>",
+          "box":true
+        }
+      },
+      "documentation":"<p>The configuration for an application to automatically stop after a certain amount of time being idle.</p>"
+    },
+    "AutoStopConfigIdleTimeoutMinutesInteger":{
+      "type":"integer",
+      "box":true,
+      "max":10080,
+      "min":1
+    },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
+    "CancelJobRunRequest":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "jobRunId"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application on which the job run will be canceled.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        },
+        "jobRunId":{
+          "shape":"JobRunId",
+          "documentation":"<p>The ID of the job run to cancel.</p>",
+          "location":"uri",
+          "locationName":"jobRunId"
+        }
+      }
+    },
+    "CancelJobRunResponse":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "jobRunId"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The output contains the application ID on which the job run is cancelled.</p>"
+        },
+        "jobRunId":{
+          "shape":"JobRunId",
+          "documentation":"<p>The output contains the ID of the cancelled job run.</p>"
+        }
+      }
+    },
+    "ClientToken":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z0-9._-]+"
+    },
+    "Configuration":{
+      "type":"structure",
+      "required":["classification"],
+      "members":{
+        "classification":{
+          "shape":"String1024",
+          "documentation":"<p>The classification within a configuration.</p>"
+        },
+        "properties":{
+          "shape":"SensitivePropertiesMap",
+          "documentation":"<p>A set of properties specified within a configuration classification.</p>"
+        },
+        "configurations":{
+          "shape":"ConfigurationList",
+          "documentation":"<p>A list of additional configurations to apply within a configuration object.</p>"
+        }
+      },
+      "documentation":"<p>A configuration specification to be used when provisioning an application. A configuration consists of a classification, properties, and optional nested configurations. A classification refers to an application-specific configuration file. Properties are the settings you want to change in that file.</p>"
+    },
+    "ConfigurationList":{
+      "type":"list",
+      "member":{"shape":"Configuration"},
+      "max":100,
+      "min":0
+    },
+    "ConfigurationOverrides":{
+      "type":"structure",
+      "members":{
+        "applicationConfiguration":{
+          "shape":"ConfigurationList",
+          "documentation":"<p>The override configurations for the application.</p>"
+        },
+        "monitoringConfiguration":{
+          "shape":"MonitoringConfiguration",
+          "documentation":"<p>The override configurations for monitoring.</p>"
+        }
+      },
+      "documentation":"<p>A configuration specification to be used to override existing configurations.</p>"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String1024"}
+      },
+      "documentation":"<p>The request could not be processed because of conflict in the current state of the resource.</p>",
+      "error":{
+        "httpStatusCode":409,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "CpuSize":{
+      "type":"string",
+      "max":15,
+      "min":1,
+      "pattern":"[1-9][0-9]*(\\s)?(vCPU|vcpu|VCPU)?"
+    },
+    "CreateApplicationRequest":{
+      "type":"structure",
+      "required":[
+        "releaseLabel",
+        "type",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The name of the application.</p>"
+        },
+        "releaseLabel":{
+          "shape":"ReleaseLabel",
+          "documentation":"<p>The EMR release version associated with the application.</p>"
+        },
+        "type":{
+          "shape":"EngineType",
+          "documentation":"<p>The type of application you want to start, such as Spark or Hive.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The client idempotency token of the application to create. Its value must be unique for each request.</p>",
+          "idempotencyToken":true
+        },
+        "initialCapacity":{
+          "shape":"InitialCapacityConfigMap",
+          "documentation":"<p>The capacity to initialize when the application is created.</p>"
+        },
+        "maximumCapacity":{
+          "shape":"MaximumAllowedResources",
+          "documentation":"<p>The maximum capacity to allocate when the application is created. This is cumulative across all workers at any given point in time, not just when an application is created. No new resources will be created once any one of the defined limits is hit.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags assigned to the application.</p>"
+        },
+        "autoStartConfiguration":{
+          "shape":"AutoStartConfig",
+          "documentation":"<p>The configuration for an application to automatically start on job submission.</p>"
+        },
+        "autoStopConfiguration":{
+          "shape":"AutoStopConfig",
+          "documentation":"<p>The configuration for an application to automatically stop after a certain amount of time being idle.</p>"
+        },
+        "networkConfiguration":{
+          "shape":"NetworkConfiguration",
+          "documentation":"<p>The network configuration for customer VPC connectivity.</p>"
+        }
+      }
+    },
+    "CreateApplicationResponse":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "arn"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The output contains the application ID.</p>"
+        },
+        "name":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The output contains the name of the application.</p>"
+        },
+        "arn":{
+          "shape":"ApplicationArn",
+          "documentation":"<p>The output contains the ARN of the application.</p>"
+        }
+      }
+    },
+    "Date":{"type":"timestamp"},
+    "DeleteApplicationRequest":{
+      "type":"structure",
+      "required":["applicationId"],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application that will be deleted.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        }
+      }
+    },
+    "DeleteApplicationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DiskSize":{
+      "type":"string",
+      "max":15,
+      "min":1,
+      "pattern":"[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)"
+    },
+    "Double":{
+      "type":"double",
+      "box":true
+    },
+    "Duration":{
+      "type":"long",
+      "max":1000000,
+      "min":0
+    },
+    "EncryptionKeyArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):kms:[a-zA-Z0-9\\-]*:(\\d{12})?:key\\/[a-zA-Z0-9-]+"
+    },
+    "EngineType":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "EntryPointArgument":{
+      "type":"string",
+      "max":10280,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "EntryPointArguments":{
+      "type":"list",
+      "member":{"shape":"EntryPointArgument"}
+    },
+    "EntryPointPath":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "GetApplicationRequest":{
+      "type":"structure",
+      "required":["applicationId"],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application that will be described.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        }
+      }
+    },
+    "GetApplicationResponse":{
+      "type":"structure",
+      "required":["application"],
+      "members":{
+        "application":{
+          "shape":"Application",
+          "documentation":"<p>The output displays information about the specified application.</p>"
+        }
+      }
+    },
+    "GetJobRunRequest":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "jobRunId"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application on which the job run is submitted.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        },
+        "jobRunId":{
+          "shape":"JobRunId",
+          "documentation":"<p>The ID of the job run.</p>",
+          "location":"uri",
+          "locationName":"jobRunId"
+        }
+      }
+    },
+    "GetJobRunResponse":{
+      "type":"structure",
+      "required":["jobRun"],
+      "members":{
+        "jobRun":{
+          "shape":"JobRun",
+          "documentation":"<p>The output displays information about the job run.</p>"
+        }
+      }
+    },
+    "Hive":{
+      "type":"structure",
+      "required":["query"],
+      "members":{
+        "query":{
+          "shape":"Query",
+          "documentation":"<p>The query for the Hive job run.</p>"
+        },
+        "initQueryFile":{
+          "shape":"InitScriptPath",
+          "documentation":"<p>The query file for the Hive job run.</p>"
+        },
+        "parameters":{
+          "shape":"HiveCliParameters",
+          "documentation":"<p>The parameters for the Hive job run.</p>"
+        }
+      },
+      "documentation":"<p>The configurations for the Hive job driver.</p>"
+    },
+    "HiveCliParameters":{
+      "type":"string",
+      "max":102400,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "IAMRoleArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):iam::(\\d{12})?:(role((\\u002F)|(\\u002F[\\u0021-\\u007F]+\\u002F))[\\w+=,.@-]+)"
+    },
+    "InitScriptPath":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "InitialCapacityConfig":{
+      "type":"structure",
+      "required":["workerCount"],
+      "members":{
+        "workerCount":{
+          "shape":"WorkerCounts",
+          "documentation":"<p>The number of workers in the initial capacity configuration.</p>"
+        },
+        "workerConfiguration":{
+          "shape":"WorkerResourceConfig",
+          "documentation":"<p>The resource configuration of the initial capacity configuration.</p>"
+        }
+      },
+      "documentation":"<p>The initial capacity configuration per worker.</p>"
+    },
+    "InitialCapacityConfigMap":{
+      "type":"map",
+      "key":{"shape":"WorkerTypeString"},
+      "value":{"shape":"InitialCapacityConfig"},
+      "max":10,
+      "min":0
+    },
+    "Integer":{
+      "type":"integer",
+      "box":true
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String1024"}
+      },
+      "documentation":"<p>Request processing failed because of an error or failure with the service.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "JobArn":{
+      "type":"string",
+      "max":1024,
+      "min":60,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):emr-serverless:.+:(\\d{12}):\\/applications\\/[0-9a-zA-Z]+\\/jobruns\\/[0-9a-zA-Z]+"
+    },
+    "JobDriver":{
+      "type":"structure",
+      "members":{
+        "sparkSubmit":{
+          "shape":"SparkSubmit",
+          "documentation":"<p>The job driver parameters specified for Spark.</p>"
+        },
+        "hive":{
+          "shape":"Hive",
+          "documentation":"<p>The job driver parameters specified for Hive.</p>"
+        }
+      },
+      "documentation":"<p>The driver that the job runs on.</p>",
+      "union":true
+    },
+    "JobRun":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "jobRunId",
+        "arn",
+        "createdBy",
+        "createdAt",
+        "updatedAt",
+        "executionRole",
+        "state",
+        "stateDetails",
+        "releaseLabel",
+        "jobDriver"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application the job is running on.</p>"
+        },
+        "jobRunId":{
+          "shape":"JobRunId",
+          "documentation":"<p>The ID of the job run.</p>"
+        },
+        "name":{
+          "shape":"String256",
+          "documentation":"<p>The optional job run name. This doesn't have to be unique.</p>"
+        },
+        "arn":{
+          "shape":"JobArn",
+          "documentation":"<p>The execution role ARN of the job run.</p>"
+        },
+        "createdBy":{
+          "shape":"RequestIdentityUserArn",
+          "documentation":"<p>The user who created the job run.</p>"
+        },
+        "createdAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the job run was created.</p>"
+        },
+        "updatedAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the job run was updated.</p>"
+        },
+        "executionRole":{
+          "shape":"IAMRoleArn",
+          "documentation":"<p>The execution role ARN of the job run.</p>"
+        },
+        "state":{
+          "shape":"JobRunState",
+          "documentation":"<p>The state of the job run.</p>"
+        },
+        "stateDetails":{
+          "shape":"String256",
+          "documentation":"<p>The state details of the job run.</p>"
+        },
+        "releaseLabel":{
+          "shape":"ReleaseLabel",
+          "documentation":"<p>The EMR release version associated with the application your job is running on.</p>"
+        },
+        "configurationOverrides":{
+          "shape":"ConfigurationOverrides",
+          "documentation":"<p>The configuration settings that are used to override default configuration.</p>"
+        },
+        "jobDriver":{
+          "shape":"JobDriver",
+          "documentation":"<p>The job driver for the job run.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags assigned to the job run.</p>"
+        },
+        "totalResourceUtilization":{
+          "shape":"TotalResourceUtilization",
+          "documentation":"<p>The aggregate vCPU, memory, and storage resources used from the time job start executing till the time job is terminated, rounded up to the nearest second.</p>"
+        },
+        "networkConfiguration":{"shape":"NetworkConfiguration"},
+        "totalExecutionDurationSeconds":{
+          "shape":"Integer",
+          "documentation":"<p>The job run total execution duration in seconds. This field is only available for job runs in a <code>COMPLETED</code>, <code>FAILED</code>, or <code>CANCELLED</code> state.</p>"
+        }
+      },
+      "documentation":"<p>Information about a job run. A job run is a unit of work, such as a Spark JAR, Hive query, or SparkSQL query, that you submit to an EMR Serverless application.</p>"
+    },
+    "JobRunId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[0-9a-z]+"
+    },
+    "JobRunState":{
+      "type":"string",
+      "enum":[
+        "SUBMITTED",
+        "PENDING",
+        "SCHEDULED",
+        "RUNNING",
+        "SUCCESS",
+        "FAILED",
+        "CANCELLING",
+        "CANCELLED"
+      ]
+    },
+    "JobRunStateSet":{
+      "type":"list",
+      "member":{"shape":"JobRunState"},
+      "max":8,
+      "min":0
+    },
+    "JobRunSummary":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "id",
+        "arn",
+        "createdBy",
+        "createdAt",
+        "updatedAt",
+        "executionRole",
+        "state",
+        "stateDetails",
+        "releaseLabel"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application the job is running on.</p>"
+        },
+        "id":{
+          "shape":"JobRunId",
+          "documentation":"<p>The ID of the job run.</p>"
+        },
+        "name":{
+          "shape":"String256",
+          "documentation":"<p>The optional job run name. This doesn't have to be unique.</p>"
+        },
+        "arn":{
+          "shape":"JobArn",
+          "documentation":"<p>The ARN of the job run.</p>"
+        },
+        "createdBy":{
+          "shape":"RequestIdentityUserArn",
+          "documentation":"<p>The user who created the job run.</p>"
+        },
+        "createdAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the job run was created.</p>"
+        },
+        "updatedAt":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when the job run was last updated.</p>"
+        },
+        "executionRole":{
+          "shape":"IAMRoleArn",
+          "documentation":"<p>The execution role ARN of the job run.</p>"
+        },
+        "state":{
+          "shape":"JobRunState",
+          "documentation":"<p>The state of the job run.</p>"
+        },
+        "stateDetails":{
+          "shape":"String256",
+          "documentation":"<p>The state details of the job run.</p>"
+        },
+        "releaseLabel":{
+          "shape":"ReleaseLabel",
+          "documentation":"<p>The EMR release version associated with the application your job is running on.</p>"
+        },
+        "type":{
+          "shape":"JobRunType",
+          "documentation":"<p>The type of job run, such as Spark or Hive.</p>"
+        }
+      },
+      "documentation":"<p>The summary of attributes associated with a job run.</p>"
+    },
+    "JobRunType":{"type":"string"},
+    "JobRuns":{
+      "type":"list",
+      "member":{"shape":"JobRunSummary"}
+    },
+    "ListApplicationsRequest":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of application results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"ListApplicationsRequestMaxResultsInteger",
+          "documentation":"<p>The maximum number of applications that can be listed.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "states":{
+          "shape":"ApplicationStateSet",
+          "documentation":"<p>An optional filter for application states. Note that if this filter contains multiple states, the resulting list will be grouped by the state.</p>",
+          "location":"querystring",
+          "locationName":"states"
+        }
+      }
+    },
+    "ListApplicationsRequestMaxResultsInteger":{
+      "type":"integer",
+      "box":true,
+      "max":50,
+      "min":1
+    },
+    "ListApplicationsResponse":{
+      "type":"structure",
+      "required":["applications"],
+      "members":{
+        "applications":{
+          "shape":"ApplicationList",
+          "documentation":"<p>The output lists the specified applications.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The output displays the token for the next set of application results. This is required for pagination and is available as a response of the previous request.</p>"
+        }
+      }
+    },
+    "ListJobRunsRequest":{
+      "type":"structure",
+      "required":["applicationId"],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application for which to list the job run.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of job run results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"ListJobRunsRequestMaxResultsInteger",
+          "documentation":"<p>The maximum number of job runs that can be listed.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "createdAtAfter":{
+          "shape":"Date",
+          "documentation":"<p>The lower bound of the option to filter by creation date and time.</p>",
+          "location":"querystring",
+          "locationName":"createdAtAfter"
+        },
+        "createdAtBefore":{
+          "shape":"Date",
+          "documentation":"<p>The upper bound of the option to filter by creation date and time.</p>",
+          "location":"querystring",
+          "locationName":"createdAtBefore"
+        },
+        "states":{
+          "shape":"JobRunStateSet",
+          "documentation":"<p>An optional filter for job run states. Note that if this filter contains multiple states, the resulting list will be grouped by the state.</p>",
+          "location":"querystring",
+          "locationName":"states"
+        }
+      }
+    },
+    "ListJobRunsRequestMaxResultsInteger":{
+      "type":"integer",
+      "box":true,
+      "max":50,
+      "min":1
+    },
+    "ListJobRunsResponse":{
+      "type":"structure",
+      "required":["jobRuns"],
+      "members":{
+        "jobRuns":{
+          "shape":"JobRuns",
+          "documentation":"<p>The output lists information about the specified job runs.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The output displays the token for the next set of job run results. This is required for pagination and is available as a response of the previous request.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the resource to list the tags for. Currently, the supported resources are Amazon EMR Serverless applications and job runs.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags for the resource.</p>"
+        }
+      }
+    },
+    "ManagedPersistenceMonitoringConfiguration":{
+      "type":"structure",
+      "members":{
+        "enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Enables managed logging and defaults to true. If set to false, managed logging will be turned off.</p>"
+        },
+        "encryptionKeyArn":{
+          "shape":"EncryptionKeyArn",
+          "documentation":"<p>The KMS key ARN to encrypt the logs stored in managed log persistence.</p>"
+        }
+      },
+      "documentation":"<p>The managed log persistence configuration for a job run.</p>"
+    },
+    "MaximumAllowedResources":{
+      "type":"structure",
+      "required":[
+        "cpu",
+        "memory"
+      ],
+      "members":{
+        "cpu":{
+          "shape":"CpuSize",
+          "documentation":"<p>The maximum allowed CPU for an application.</p>"
+        },
+        "memory":{
+          "shape":"MemorySize",
+          "documentation":"<p>The maximum allowed resources for an application.</p>"
+        },
+        "disk":{
+          "shape":"DiskSize",
+          "documentation":"<p>The maximum allowed disk for an application.</p>"
+        }
+      },
+      "documentation":"<p>The maximum allowed cumulative resources for an application. No new resources will be created once the limit is hit.</p>"
+    },
+    "MemorySize":{
+      "type":"string",
+      "max":15,
+      "min":1,
+      "pattern":"[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)?"
+    },
+    "MonitoringConfiguration":{
+      "type":"structure",
+      "members":{
+        "s3MonitoringConfiguration":{
+          "shape":"S3MonitoringConfiguration",
+          "documentation":"<p>The Amazon S3 configuration for monitoring log publishing.</p>"
+        },
+        "managedPersistenceMonitoringConfiguration":{
+          "shape":"ManagedPersistenceMonitoringConfiguration",
+          "documentation":"<p>The managed log persistence configuration for a job run.</p>"
+        }
+      },
+      "documentation":"<p>The configuration setting for monitoring.</p>"
+    },
+    "NetworkConfiguration":{
+      "type":"structure",
+      "members":{
+        "subnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>The array of subnet Ids for customer VPC connectivity.</p>"
+        },
+        "securityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>The array of security group Ids for customer VPC connectivity.</p>"
+        }
+      },
+      "documentation":"<p>The network configuration for customer VPC connectivity.</p>"
+    },
+    "NextToken":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"[A-Za-z0-9_=-]+"
+    },
+    "Query":{
+      "type":"string",
+      "max":10280,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "ReleaseLabel":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z0-9._/-]+"
+    },
+    "RequestIdentityUserArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):(iam|sts)::(\\d{12})?:[\\w/+=,.@-]+"
+    },
+    "ResourceArn":{
+      "type":"string",
+      "max":1024,
+      "min":60,
+      "pattern":"arn:(aws[a-zA-Z0-9-]*):emr-serverless:.+:(\\d{12}):\\/applications\\/[0-9a-zA-Z]+(\\/jobruns\\/[0-9a-zA-Z]+)?"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String1024"}
+      },
+      "documentation":"<p>The specified resource was not found.</p>",
+      "error":{
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "S3MonitoringConfiguration":{
+      "type":"structure",
+      "members":{
+        "logUri":{
+          "shape":"UriString",
+          "documentation":"<p>The Amazon S3 destination URI for log publishing.</p>"
+        },
+        "encryptionKeyArn":{
+          "shape":"EncryptionKeyArn",
+          "documentation":"<p>The KMS key ARN to encrypt the logs published to the given Amazon S3 destination.</p>"
+        }
+      },
+      "documentation":"<p>The Amazon S3 configuration for monitoring log publishing. You can configure your jobs to send log information to Amazon S3.</p>"
+    },
+    "SecurityGroupIds":{
+      "type":"list",
+      "member":{"shape":"SecurityGroupString"},
+      "max":5,
+      "min":0
+    },
+    "SecurityGroupString":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"[-0-9a-zA-Z]+.*"
+    },
+    "SensitivePropertiesMap":{
+      "type":"map",
+      "key":{"shape":"String1024"},
+      "value":{"shape":"String1024"},
+      "max":100,
+      "min":0,
+      "sensitive":true
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String1024"}
+      },
+      "documentation":"<p>The maximum number of resources per account has been reached.</p>",
+      "error":{
+        "httpStatusCode":402,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "SparkSubmit":{
+      "type":"structure",
+      "required":["entryPoint"],
+      "members":{
+        "entryPoint":{
+          "shape":"EntryPointPath",
+          "documentation":"<p>The entry point for the Spark submit job run.</p>"
+        },
+        "entryPointArguments":{
+          "shape":"EntryPointArguments",
+          "documentation":"<p>The arguments for the Spark submit job run.</p>"
+        },
+        "sparkSubmitParameters":{
+          "shape":"SparkSubmitParameters",
+          "documentation":"<p>The parameters for the Spark submit job run.</p>"
+        }
+      },
+      "documentation":"<p>The configurations for the Spark submit job driver.</p>"
+    },
+    "SparkSubmitParameters":{
+      "type":"string",
+      "max":102400,
+      "min":1,
+      "pattern":".*\\S.*",
+      "sensitive":true
+    },
+    "StartApplicationRequest":{
+      "type":"structure",
+      "required":["applicationId"],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application to start.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        }
+      }
+    },
+    "StartApplicationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "StartJobRunRequest":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "clientToken",
+        "executionRoleArn"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application on which to run the job.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The client idempotency token of the job run to start. Its value must be unique for each request.</p>",
+          "idempotencyToken":true
+        },
+        "executionRoleArn":{
+          "shape":"IAMRoleArn",
+          "documentation":"<p>The execution role ARN for the job run.</p>"
+        },
+        "jobDriver":{
+          "shape":"JobDriver",
+          "documentation":"<p>The job driver for the job run.</p>"
+        },
+        "configurationOverrides":{
+          "shape":"ConfigurationOverrides",
+          "documentation":"<p>The configuration overrides for the job run.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags assigned to the job run.</p>"
+        },
+        "executionTimeoutMinutes":{
+          "shape":"Duration",
+          "documentation":"<p>The maximum duration for the job run to run. If the job run runs beyond this duration, it will be automatically cancelled.</p>",
+          "box":true
+        },
+        "name":{
+          "shape":"String256",
+          "documentation":"<p>The optional job run name. This doesn't have to be unique.</p>"
+        }
+      }
+    },
+    "StartJobRunResponse":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "jobRunId",
+        "arn"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>This output displays the application ID on which the job run was submitted.</p>"
+        },
+        "jobRunId":{
+          "shape":"JobRunId",
+          "documentation":"<p>The output contains the ID of the started job run.</p>"
+        },
+        "arn":{
+          "shape":"JobArn",
+          "documentation":"<p>The output lists the execution role ARN of the job run.</p>"
+        }
+      }
+    },
+    "StopApplicationRequest":{
+      "type":"structure",
+      "required":["applicationId"],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application to stop.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        }
+      }
+    },
+    "StopApplicationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "String1024":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "String256":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "SubnetIds":{
+      "type":"list",
+      "member":{"shape":"SubnetString"},
+      "max":16,
+      "min":0
+    },
+    "SubnetString":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"[-0-9a-zA-Z]+.*"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[A-Za-z0-9 /_.:=+@-]+"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the resource to list the tags for. Currently, the supported resources are Amazon EMR Serverless applications and job runs.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags to add to the resource. A tag is an array of key-value pairs.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"[A-Za-z0-9 /_.:=+@-]*"
+    },
+    "TotalResourceUtilization":{
+      "type":"structure",
+      "members":{
+        "vCPUHour":{
+          "shape":"Double",
+          "documentation":"<p>The aggregated vCPU used per hour from the time job start executing till the time job is terminated.</p>"
+        },
+        "memoryGBHour":{
+          "shape":"Double",
+          "documentation":"<p>The aggregated memory used per hour from the time job start executing till the time job is terminated.</p>"
+        },
+        "storageGBHour":{
+          "shape":"Double",
+          "documentation":"<p>The aggregated storage used per hour from the time job start executing till the time job is terminated.</p>"
+        }
+      },
+      "documentation":"<p>The aggregate vCPU, memory, and storage resources used from the time job start executing till the time job is terminated, rounded up to the nearest second.</p>"
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the resource to list the tags for. Currently, the supported resources are Amazon EMR Serverless applications and job runs.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The keys of the tags to be removed.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateApplicationRequest":{
+      "type":"structure",
+      "required":[
+        "applicationId",
+        "clientToken"
+      ],
+      "members":{
+        "applicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The ID of the application to update.</p>",
+          "location":"uri",
+          "locationName":"applicationId"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The client idempotency token of the application to update. Its value must be unique for each request.</p>",
+          "idempotencyToken":true
+        },
+        "initialCapacity":{
+          "shape":"InitialCapacityConfigMap",
+          "documentation":"<p>The capacity to initialize when the application is updated.</p>"
+        },
+        "maximumCapacity":{
+          "shape":"MaximumAllowedResources",
+          "documentation":"<p>The maximum capacity to allocate when the application is updated. This is cumulative across all workers at any given point in time during the lifespan of the application. No new resources will be created once any one of the defined limits is hit.</p>"
+        },
+        "autoStartConfiguration":{
+          "shape":"AutoStartConfig",
+          "documentation":"<p>The configuration for an application to automatically start on job submission.</p>"
+        },
+        "autoStopConfiguration":{
+          "shape":"AutoStopConfig",
+          "documentation":"<p>The configuration for an application to automatically stop after a certain amount of time being idle.</p>"
+        },
+        "networkConfiguration":{"shape":"NetworkConfiguration"}
+      }
+    },
+    "UpdateApplicationResponse":{
+      "type":"structure",
+      "required":["application"],
+      "members":{
+        "application":{
+          "shape":"Application",
+          "documentation":"<p>Information about the updated application.</p>"
+        }
+      }
+    },
+    "UriString":{
+      "type":"string",
+      "max":10280,
+      "min":1,
+      "pattern":".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDBFF-\\uDC00\\uDFFF\\r\\n\\t]*.*"
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String1024"}
+      },
+      "documentation":"<p>The input fails to satisfy the constraints specified by an AWS service.</p>",
+      "error":{
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "WorkerCounts":{
+      "type":"long",
+      "max":1000000,
+      "min":1
+    },
+    "WorkerResourceConfig":{
+      "type":"structure",
+      "required":[
+        "cpu",
+        "memory"
+      ],
+      "members":{
+        "cpu":{
+          "shape":"CpuSize",
+          "documentation":"<p>The CPU requirements for every worker instance of the worker type.</p>"
+        },
+        "memory":{
+          "shape":"MemorySize",
+          "documentation":"<p>The memory requirements for every worker instance of the worker type.</p>"
+        },
+        "disk":{
+          "shape":"DiskSize",
+          "documentation":"<p>The disk requirements for every worker instance of the worker type.</p>"
+        }
+      },
+      "documentation":"<p>The cumulative configuration requirements for every worker instance of the worker type.</p>"
+    },
+    "WorkerTypeString":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":"[a-zA-Z]+[-_]*[a-zA-Z]+"
+    }
+  },
+  "documentation":"<p>Amazon EMR Serverless is a new deployment option for Amazon EMR. EMR Serverless provides a serverless runtime environment that simplifies running analytics applications using the latest open source frameworks such as Apache Spark and Apache Hive. With EMR Serverless, you don’t have to configure, optimize, secure, or operate clusters to run applications with these frameworks.</p> <p>The API reference to Amazon EMR Serverless is <code>emr-serverless</code>. The <code>emr-serverless</code> prefix is used in the following scenarios: </p> <ul> <li> <p>It is the prefix in the CLI commands for Amazon EMR Serverless. For example, <code>aws emr-serverless start-job-run</code>.</p> </li> <li> <p>It is the prefix before IAM policy actions for Amazon EMR Serverless. For example, <code>\"Action\": [\"emr-serverless:StartJobRun\"]</code>. For more information, see <a href=\"https://docs.aws.amazon.com/emr/latest/EMR-Serverless-UserGuide/security_iam_service-with-iam.html#security_iam_service-with-iam-id-based-policies-actions\">Policy actions for Amazon EMR Serverless</a>.</p> </li> <li> <p>It is the prefix used in Amazon EMR Serverless service endpoints. For example, <code>emr-serverless.us-east-2.amazonaws.com</code>.</p> </li> </ul>"
+}
diff --git a/contrib/python/botocore/py3/botocore/data/endpoints.json b/contrib/python/botocore/py3/botocore/data/endpoints.json
index 2928305f479..142d128f31c 100644
--- a/contrib/python/botocore/py3/botocore/data/endpoints.json
+++ b/contrib/python/botocore/py3/botocore/data/endpoints.json
@@ -1658,6 +1658,31 @@
           "us-west-2" : { }
         }
       },
+      "backup-gateway" : {
+        "endpoints" : {
+          "af-south-1" : { },
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-northeast-3" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-south-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
       "batch" : {
         "defaults" : {
           "variants" : [ {
@@ -4960,6 +4985,38 @@
           }
         }
       },
+      "emr-serverless" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "eu-west-1" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "deprecated" : true,
+            "hostname" : "emr-serverless-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "deprecated" : true,
+            "hostname" : "emr-serverless-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : {
+            "variants" : [ {
+              "hostname" : "emr-serverless-fips.us-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
+          "us-west-2" : {
+            "variants" : [ {
+              "hostname" : "emr-serverless-fips.us-west-2.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          }
+        }
+      },
       "entitlement.marketplace" : {
         "defaults" : {
           "credentialScope" : {
@@ -6190,10 +6247,6 @@
         "isRegionalized" : true
       },
       "health" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "sslCommonName" : "health.us-east-1.amazonaws.com"
-        },
         "endpoints" : {
           "fips-us-east-2" : {
             "credentialScope" : {
@@ -6212,9 +6265,7 @@
               "tags" : [ "fips" ]
             } ]
           }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
+        }
       },
       "healthlake" : {
         "defaults" : {
@@ -9083,7 +9134,12 @@
             },
             "hostname" : "portal.sso.ap-northeast-2.amazonaws.com"
           },
-          "ap-northeast-3" : { },
+          "ap-northeast-3" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-3"
+            },
+            "hostname" : "portal.sso.ap-northeast-3.amazonaws.com"
+          },
           "ap-south-1" : {
             "credentialScope" : {
               "region" : "ap-south-1"
@@ -14908,6 +14964,12 @@
           "us-gov-west-1" : { }
         }
       },
+      "backup-gateway" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
       "batch" : {
         "defaults" : {
           "variants" : [ {
diff --git a/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json b/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
index 1ddc4c2953f..713f21afb78 100644
--- a/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
@@ -660,7 +660,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Returns a list of the monitoring evaluation results and predictor events collected by the monitor resource during different windows of time.</p> <p>For information about monitoring see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/predictor-monitoring-results.html\">Viewing Monitoring Results</a>. For more information about retrieving monitoring results see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/predictor-monitoring-results.html\">Viewing Monitoring Results</a>.</p>",
+      "documentation":"<p>Returns a list of the monitoring evaluation results and predictor events collected by the monitor resource during different windows of time.</p> <p>For information about monitoring see <a>predictor-monitoring</a>. For more information about retrieving monitoring results see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/predictor-monitoring-results.html\">Viewing Monitoring Results</a>.</p>",
       "idempotent":true
     },
     "ListMonitors":{
@@ -1010,6 +1010,10 @@
         "MonitorConfig":{
           "shape":"MonitorConfig",
           "documentation":"<p>The configuration details for predictor monitoring. Provide a name for the monitor resource to enable predictor monitoring.</p> <p>Predictor monitoring allows you to see how your predictor's performance changes over time. For more information, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/predictor-monitoring.html\">Predictor Monitoring</a>.</p>"
+        },
+        "TimeAlignmentBoundary":{
+          "shape":"TimeAlignmentBoundary",
+          "documentation":"<p>The time boundary Forecast uses to align and aggregate any data that doesn't align with your forecast frequency. Provide the unit of time and the time boundary as a key value pair. For more information on specifying a time boundary, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/data-aggregation.html#specifying-time-boundary\">Specifying a Time Boundary</a>. If you don't provide a time boundary, Forecast uses a set of <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/data-aggregation.html#default-time-boundaries\">Default Time Boundaries</a>.</p>"
         }
       }
     },
@@ -1594,6 +1598,23 @@
       "type":"list",
       "member":{"shape":"DatasetSummary"}
     },
+    "DayOfMonth":{
+      "type":"integer",
+      "max":28,
+      "min":1
+    },
+    "DayOfWeek":{
+      "type":"string",
+      "enum":[
+        "MONDAY",
+        "TUESDAY",
+        "WEDNESDAY",
+        "THURSDAY",
+        "FRIDAY",
+        "SATURDAY",
+        "SUNDAY"
+      ]
+    },
     "DeleteDatasetGroupRequest":{
       "type":"structure",
       "required":["DatasetGroupArn"],
@@ -1785,6 +1806,10 @@
         "MonitorInfo":{
           "shape":"MonitorInfo",
           "documentation":"<p>A object with the Amazon Resource Name (ARN) and status of the monitor resource.</p>"
+        },
+        "TimeAlignmentBoundary":{
+          "shape":"TimeAlignmentBoundary",
+          "documentation":"<p>The time boundary Forecast uses when aggregating data.</p>"
         }
       }
     },
@@ -2855,6 +2880,11 @@
         }
       }
     },
+    "Hour":{
+      "type":"integer",
+      "max":23,
+      "min":0
+    },
     "HyperParameterTuningJobConfig":{
       "type":"structure",
       "members":{
@@ -3424,6 +3454,23 @@
       "type":"list",
       "member":{"shape":"MonitorSummary"}
     },
+    "Month":{
+      "type":"string",
+      "enum":[
+        "JANUARY",
+        "FEBRUARY",
+        "MARCH",
+        "APRIL",
+        "MAY",
+        "JUNE",
+        "JULY",
+        "AUGUST",
+        "SEPTEMBER",
+        "OCTOBER",
+        "NOVEMBER",
+        "DECEMBER"
+      ]
+    },
     "Name":{
       "type":"string",
       "max":63,
@@ -3570,8 +3617,14 @@
     "PredictorMonitorEvaluation":{
       "type":"structure",
       "members":{
-        "ResourceArn":{"shape":"Arn"},
-        "MonitorArn":{"shape":"Arn"},
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to monitor.</p>"
+        },
+        "MonitorArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitor resource.</p>"
+        },
         "EvaluationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The timestamp that indicates when the monitor evaluation was started. </p>"
@@ -3976,6 +4029,28 @@
       "type":"list",
       "member":{"shape":"WindowSummary"}
     },
+    "TimeAlignmentBoundary":{
+      "type":"structure",
+      "members":{
+        "Month":{
+          "shape":"Month",
+          "documentation":"<p>The month to use for time alignment during aggregation. The month must be in uppercase.</p>"
+        },
+        "DayOfMonth":{
+          "shape":"DayOfMonth",
+          "documentation":"<p>The day of the month to use for time alignment during aggregation.</p>"
+        },
+        "DayOfWeek":{
+          "shape":"DayOfWeek",
+          "documentation":"<p>The day of week to use for time alignment during aggregation. The day must be in uppercase.</p>"
+        },
+        "Hour":{
+          "shape":"Hour",
+          "documentation":"<p>The hour of day to use for time alignment during aggregation.</p>"
+        }
+      },
+      "documentation":"<p>The time boundary Forecast uses to align and aggregate your data to match your forecast frequency. Provide the unit of time and the time boundary as a key value pair. If you don't provide a time boundary, Forecast uses a set of <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/data-aggregation.html#default-time-boundaries\">Default Time Boundaries</a>. </p> <p>For more information about aggregation, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/data-aggregation.html\">Data Aggregation for Different Forecast Frequencies</a>. For more information setting a custom time boundary, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/data-aggregation.html#specifying-time-boundary\">Specifying a Time Boundary</a>. </p>"
+    },
     "TimePointGranularity":{
       "type":"string",
       "enum":[
diff --git a/contrib/python/botocore/py3/botocore/data/lightsail/2016-11-28/service-2.json b/contrib/python/botocore/py3/botocore/data/lightsail/2016-11-28/service-2.json
index 55668bb83d6..26adecd1510 100644
--- a/contrib/python/botocore/py3/botocore/data/lightsail/2016-11-28/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/lightsail/2016-11-28/service-2.json
@@ -4185,6 +4185,10 @@
         "url":{
           "shape":"string",
           "documentation":"<p>The publicly accessible URL of the container service.</p> <p>If no public endpoint is specified in the <code>currentDeployment</code>, this URL returns a 404 response.</p>"
+        },
+        "privateRegistryAccess":{
+          "shape":"PrivateRegistryAccess",
+          "documentation":"<p>An object that describes the configuration for the container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>Describes an Amazon Lightsail container service.</p>"
@@ -4242,6 +4246,30 @@
         "FAILED"
       ]
     },
+    "ContainerServiceECRImagePullerRole":{
+      "type":"structure",
+      "members":{
+        "isActive":{
+          "shape":"boolean",
+          "documentation":"<p>A Boolean value that indicates whether the role is activated.</p>"
+        },
+        "principalArn":{
+          "shape":"string",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the role, if it is activated.</p>"
+        }
+      },
+      "documentation":"<p>Describes the activation status of the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>When activated, Lightsail creates an Identity and Access Management (IAM) role for the specified Lightsail container service. You can use the ARN of the role to create a trust relationship between your Lightsail container service and an Amazon ECR private repository in your Amazon Web Services account. This allows your container service to pull images from Amazon ECR private repositories. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
+    },
+    "ContainerServiceECRImagePullerRoleRequest":{
+      "type":"structure",
+      "members":{
+        "isActive":{
+          "shape":"boolean",
+          "documentation":"<p>A Boolean value that indicates whether to activate the role.</p>"
+        }
+      },
+      "documentation":"<p>Describes a request to activate or deactivate the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>When activated, Lightsail creates an Identity and Access Management (IAM) role for the specified Lightsail container service. You can use the ARN of the role to create a trust relationship between your Lightsail container service and an Amazon ECR private repository in your Amazon Web Services account. This allows your container service to pull images from Amazon ECR private repositories. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
+    },
     "ContainerServiceEndpoint":{
       "type":"structure",
       "members":{
@@ -4745,6 +4773,10 @@
         "deployment":{
           "shape":"ContainerServiceDeploymentRequest",
           "documentation":"<p>An object that describes a deployment for the container service.</p> <p>A deployment specifies the containers that will be launched on the container service and their settings, such as the ports to open, the environment variables to apply, and the launch command to run. It also specifies the container that will serve as the public endpoint of the deployment and its settings, such as the HTTP or HTTPS port to use, and the health check configuration.</p>"
+        },
+        "privateRegistryAccess":{
+          "shape":"PrivateRegistryAccessRequest",
+          "documentation":"<p>An object to describe the configuration for the container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
         }
       }
     },
@@ -9934,6 +9966,26 @@
         "closed"
       ]
     },
+    "PrivateRegistryAccess":{
+      "type":"structure",
+      "members":{
+        "ecrImagePullerRole":{
+          "shape":"ContainerServiceECRImagePullerRole",
+          "documentation":"<p>An object that describes the activation status of the role that you can use to grant a Lightsail container service access to Amazon ECR private repositories. If the role is activated, the Amazon Resource Name (ARN) of the role is also listed.</p>"
+        }
+      },
+      "documentation":"<p>Describes the configuration for an Amazon Lightsail container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
+    },
+    "PrivateRegistryAccessRequest":{
+      "type":"structure",
+      "members":{
+        "ecrImagePullerRole":{
+          "shape":"ContainerServiceECRImagePullerRoleRequest",
+          "documentation":"<p>An object to describe a request to activate or deactivate the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories.</p>"
+        }
+      },
+      "documentation":"<p>Describes a request to configure an Amazon Lightsail container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
+    },
     "PutAlarmRequest":{
       "type":"structure",
       "required":[
@@ -11211,6 +11263,10 @@
         "publicDomainNames":{
           "shape":"ContainerServicePublicDomains",
           "documentation":"<p>The public domain names to use with the container service, such as <code>example.com</code> and <code>www.example.com</code>.</p> <p>You can specify up to four public domain names for a container service. The domain names that you specify are used when you create a deployment with a container configured as the public endpoint of your container service.</p> <p>If you don't specify public domain names, then you can use the default domain of the container service.</p> <important> <p>You must create and validate an SSL/TLS certificate before you can use public domain names with your container service. Use the <code>CreateCertificate</code> action to create a certificate for the public domain names you want to use with your container service.</p> </important> <p>You can specify public domain names using a string to array map as shown in the example later on this page.</p>"
+        },
+        "privateRegistryAccess":{
+          "shape":"PrivateRegistryAccessRequest",
+          "documentation":"<p>An object to describe the configuration for the container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.</p> <p>For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-service-ecr-private-repo-access\">Configuring access to an Amazon ECR private repository for an Amazon Lightsail container service</a> in the <i>Amazon Lightsail Developer Guide</i>.</p>"
         }
       }
     },
diff --git a/contrib/restricted/abseil-cpp-tstring/provides.pbtxt b/contrib/restricted/abseil-cpp-tstring/provides.pbtxt
deleted file mode 100644
index 34db641a554..00000000000
--- a/contrib/restricted/abseil-cpp-tstring/provides.pbtxt
+++ /dev/null
@@ -1,66 +0,0 @@
-p { i: "abseil-cpp" x: "absl_bad_any_cast_impl" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_any_cast" }
-p { i: "abseil-cpp" x: "absl_bad_optional_access" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access" }
-p { i: "abseil-cpp" x: "absl_bad_variant_access" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access" }
-p { i: "abseil-cpp" x: "absl_base" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base" }
-p { i: "abseil-cpp" x: "absl_city" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/city" }
-p { i: "abseil-cpp" x: "absl_civil_time" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time" }
-p { i: "abseil-cpp" x: "absl_cord" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord" }
-p { i: "abseil-cpp" x: "absl_cord_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal" }
-p { i: "abseil-cpp" x: "absl_cordz_functions" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions" }
-p { i: "abseil-cpp" x: "absl_cordz_handle" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle" }
-p { i: "abseil-cpp" x: "absl_cordz_info" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info" }
-p { i: "abseil-cpp" x: "absl_cordz_sample_token" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_sample_token" }
-p { i: "abseil-cpp" x: "absl_debugging_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging" }
-p { i: "abseil-cpp" x: "absl_demangle_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/demangle" }
-p { i: "abseil-cpp" x: "absl_examine_stack" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal" }
-p { i: "abseil-cpp" x: "absl_exponential_biased" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased" }
-p { i: "abseil-cpp" x: "absl_failure_signal_handler" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/failure_signal_handler" }
-p { i: "abseil-cpp" x: "absl_flags" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags" }
-p { i: "abseil-cpp" x: "absl_flags_commandlineflag" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/commandlineflag" }
-p { i: "abseil-cpp" x: "absl_flags_commandlineflag_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/commandlineflag" }
-p { i: "abseil-cpp" x: "absl_flags_config" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/usage_config" }
-p { i: "abseil-cpp" x: "absl_flags_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag" }
-p { i: "abseil-cpp" x: "absl_flags_marshalling" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/marshalling" }
-p { i: "abseil-cpp" x: "absl_flags_parse" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/parse" }
-p { i: "abseil-cpp" x: "absl_flags_private_handle_accessor" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/private_handle_accessor" }
-p { i: "abseil-cpp" x: "absl_flags_program_name" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/program_name" }
-p { i: "abseil-cpp" x: "absl_flags_reflection" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/reflection" }
-p { i: "abseil-cpp" x: "absl_flags_usage" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/usage" }
-p { i: "abseil-cpp" x: "absl_flags_usage_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/usage" }
-p { i: "abseil-cpp" x: "absl_graphcycles_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal" }
-p { i: "abseil-cpp" x: "absl_hash" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/hash" }
-p { i: "abseil-cpp" x: "absl_hashtablez_sampler" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/absl_hashtablez_sampler" }
-p { i: "abseil-cpp" x: "absl_int128" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/numeric" }
-p { i: "abseil-cpp" x: "absl_leak_check" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/leak_check" }
-p { i: "abseil-cpp" x: "absl_leak_check_disable" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/leak_check_disable" }
-p { i: "abseil-cpp" x: "absl_log_severity" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity" }
-p { i: "abseil-cpp" x: "absl_low_level_hash" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal" }
-p { i: "abseil-cpp" x: "absl_malloc_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc" }
-p { i: "abseil-cpp" x: "absl_periodic_sampler" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/periodic_sampler" }
-p { i: "abseil-cpp" x: "absl_random_distributions" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/absl_random_distributions" }
-p { i: "abseil-cpp" x: "absl_random_internal_distribution_test_util" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/absl_random_internal_distribution_test_util" }
-p { i: "abseil-cpp" x: "absl_random_internal_platform" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/randen_round_keys" }
-p { i: "abseil-cpp" x: "absl_random_internal_pool_urbg" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/pool_urbg" }
-p { i: "abseil-cpp" x: "absl_random_internal_randen" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/randen" }
-p { i: "abseil-cpp" x: "absl_random_internal_randen_hwaes" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/randen_detect" }
-p { i: "abseil-cpp" x: "absl_random_internal_randen_hwaes_impl" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/randen_hwaes" }
-p { i: "abseil-cpp" x: "absl_random_internal_randen_slow" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/randen_slow" }
-p { i: "abseil-cpp" x: "absl_random_internal_seed_material" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/internal/seed_material" }
-p { i: "abseil-cpp" x: "absl_random_seed_gen_exception" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_gen_exception" }
-p { i: "abseil-cpp" x: "absl_random_seed_sequences" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_sequences" }
-p { i: "abseil-cpp" x: "absl_raw_hash_set" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set" }
-p { i: "abseil-cpp" x: "absl_raw_logging_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging" }
-p { i: "abseil-cpp" x: "absl_scoped_set_env" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/scoped_set_env" }
-p { i: "abseil-cpp" x: "absl_spinlock_wait" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait" }
-p { i: "abseil-cpp" x: "absl_stacktrace" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace" }
-p { i: "abseil-cpp" x: "absl_status" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/status" }
-p { i: "abseil-cpp" x: "absl_statusor" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor" }
-p { i: "abseil-cpp" x: "absl_str_format_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format" }
-p { i: "abseil-cpp" x: "absl_strerror" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/strerror" }
-p { i: "abseil-cpp" x: "absl_strings" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings" }
-p { i: "abseil-cpp" x: "absl_strings_internal" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal" }
-p { i: "abseil-cpp" x: "absl_symbolize" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize" }
-p { i: "abseil-cpp" x: "absl_synchronization" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/synchronization" }
-p { i: "abseil-cpp" x: "absl_throw_delegate" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate" }
-p { i: "abseil-cpp" x: "absl_time" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/time" }
-p { i: "abseil-cpp" x: "absl_time_zone" ix: true peerdir: "contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone" }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
index 80b145a1ad0..8fee7e21b42 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(abseil-cpp-tstring-y_absl-algorithm INTERFACE)
-target_link_libraries(abseil-cpp-tstring-y_absl-algorithm INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
index aebc3b7a3e8..c82444b004f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
@@ -7,18 +7,18 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-base)
-target_include_directories(yabseil-cpp-tstring-y_absl-base PUBLIC
+add_library(abseil-cpp-tstring-y_absl-base)
+target_include_directories(abseil-cpp-tstring-y_absl-base PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-base PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-base PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(yabseil-cpp-tstring-y_absl-base PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-base PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/cycleclock.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/sysinfo.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc/CMakeLists.txt
index 2c4d1b56d00..3ed25b8aee1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc/CMakeLists.txt
@@ -7,18 +7,18 @@
 
 
 
-add_library(ybase-internal-low_level_alloc)
-target_include_directories(ybase-internal-low_level_alloc PUBLIC
+add_library(base-internal-low_level_alloc)
+target_include_directories(base-internal-low_level_alloc PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ybase-internal-low_level_alloc PUBLIC
+target_link_libraries(base-internal-low_level_alloc PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(ybase-internal-low_level_alloc PRIVATE
+target_sources(base-internal-low_level_alloc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/low_level_alloc.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging/CMakeLists.txt
index 84038ac77de..7b10e2dbd00 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging/CMakeLists.txt
@@ -7,15 +7,15 @@
 
 
 
-add_library(ybase-internal-raw_logging)
-target_include_directories(ybase-internal-raw_logging PUBLIC
+add_library(base-internal-raw_logging)
+target_include_directories(base-internal-raw_logging PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ybase-internal-raw_logging PUBLIC
+target_link_libraries(base-internal-raw_logging PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabsl-base-log_severity
+  y_absl-base-log_severity
 )
-target_sources(ybase-internal-raw_logging PRIVATE
+target_sources(base-internal-raw_logging PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait/CMakeLists.txt
index 86b38825502..eb07d036865 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait/CMakeLists.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(ybase-internal-spinlock_wait)
-target_include_directories(ybase-internal-spinlock_wait PUBLIC
+add_library(base-internal-spinlock_wait)
+target_include_directories(base-internal-spinlock_wait PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ybase-internal-spinlock_wait PUBLIC
+target_link_libraries(base-internal-spinlock_wait PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(ybase-internal-spinlock_wait PRIVATE
+target_sources(base-internal-spinlock_wait PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock_wait.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate/CMakeLists.txt
index 8b33f943477..2926b18c8e9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate/CMakeLists.txt
@@ -7,16 +7,16 @@
 
 
 
-add_library(ybase-internal-throw_delegate)
-target_include_directories(ybase-internal-throw_delegate PUBLIC
+add_library(base-internal-throw_delegate)
+target_include_directories(base-internal-throw_delegate PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ybase-internal-throw_delegate PUBLIC
+target_link_libraries(base-internal-throw_delegate PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
+  base-internal-raw_logging
+  y_absl-base-log_severity
 )
-target_sources(ybase-internal-throw_delegate PRIVATE
+target_sources(base-internal-throw_delegate PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/throw_delegate.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity/CMakeLists.txt
index cab76940f04..c6c613af019 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity/CMakeLists.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(yabsl-base-log_severity)
-target_include_directories(yabsl-base-log_severity PUBLIC
+add_library(y_absl-base-log_severity)
+target_include_directories(y_absl-base-log_severity PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-base-log_severity PUBLIC
+target_link_libraries(y_absl-base-log_severity PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(yabsl-base-log_severity PRIVATE
+target_sources(y_absl-base-log_severity PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/base/log_severity.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/city/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/city/CMakeLists.txt
index 9a0be716d58..4636b3a30b8 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/city/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/city/CMakeLists.txt
@@ -7,18 +7,18 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-city)
-target_include_directories(yabseil-cpp-tstring-y_absl-city PUBLIC
+add_library(abseil-cpp-tstring-y_absl-city)
+target_include_directories(abseil-cpp-tstring-y_absl-city PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-city PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-city PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(yabseil-cpp-tstring-y_absl-city PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-city PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/city.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
index 41a4db8a109..19e2bc893e6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(abseil-cpp-tstring-y_absl-container INTERFACE)
-target_link_libraries(abseil-cpp-tstring-y_absl-container INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/absl_hashtablez_sampler/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/absl_hashtablez_sampler/CMakeLists.txt
index c50189072a8..76377443ab0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/absl_hashtablez_sampler/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/absl_hashtablez_sampler/CMakeLists.txt
@@ -7,34 +7,34 @@
 
 
 
-add_library(ycontainer-internal-absl_hashtablez_sampler)
-target_include_directories(ycontainer-internal-absl_hashtablez_sampler PUBLIC
+add_library(container-internal-absl_hashtablez_sampler)
+target_include_directories(container-internal-absl_hashtablez_sampler PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ycontainer-internal-absl_hashtablez_sampler PUBLIC
+target_link_libraries(container-internal-absl_hashtablez_sampler PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
 )
-target_sources(ycontainer-internal-absl_hashtablez_sampler PRIVATE
+target_sources(container-internal-absl_hashtablez_sampler PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler_force_weak_definition.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set/CMakeLists.txt
index c1b33f90553..f2139f6685f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set/CMakeLists.txt
@@ -7,37 +7,37 @@
 
 
 
-add_library(ycontainer-internal-raw_hash_set)
-target_include_directories(ycontainer-internal-raw_hash_set PUBLIC
+add_library(container-internal-raw_hash_set)
+target_include_directories(container-internal-raw_hash_set PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ycontainer-internal-raw_hash_set PUBLIC
+target_link_libraries(container-internal-raw_hash_set PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  ycontainer-internal-absl_hashtablez_sampler
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-hash
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
-  yabsl-types-bad_optional_access
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  container-internal-absl_hashtablez_sampler
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-hash
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
   abseil-cpp-tstring-y_absl-types
+  y_absl-types-bad_optional_access
 )
-target_sources(ycontainer-internal-raw_hash_set PRIVATE
+target_sources(container-internal-raw_hash_set PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
index 82d20a5369a..0e9e9b4d352 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
@@ -7,17 +7,17 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-debugging)
-target_include_directories(yabseil-cpp-tstring-y_absl-debugging PUBLIC
+add_library(abseil-cpp-tstring-y_absl-debugging)
+target_include_directories(abseil-cpp-tstring-y_absl-debugging PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-debugging PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-debugging PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
+  base-internal-raw_logging
+  y_absl-base-log_severity
 )
-target_sources(yabseil-cpp-tstring-y_absl-debugging PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-debugging PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/address_is_readable.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/vdso_support.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace/CMakeLists.txt
index a1b3f96daf5..530b82a105f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace/CMakeLists.txt
@@ -7,17 +7,17 @@
 
 
 
-add_library(yabsl-debugging-stacktrace)
-target_include_directories(yabsl-debugging-stacktrace PUBLIC
+add_library(y_absl-debugging-stacktrace)
+target_include_directories(y_absl-debugging-stacktrace PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-debugging-stacktrace PUBLIC
+target_link_libraries(y_absl-debugging-stacktrace PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
+  base-internal-raw_logging
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
 )
-target_sources(yabsl-debugging-stacktrace PRIVATE
+target_sources(y_absl-debugging-stacktrace PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/stacktrace.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize/CMakeLists.txt
index 2d4aaeb7e8f..33ce1177fb1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize/CMakeLists.txt
@@ -7,25 +7,25 @@
 
 
 
-add_library(yabsl-debugging-symbolize)
-target_include_directories(yabsl-debugging-symbolize PUBLIC
+add_library(y_absl-debugging-symbolize)
+target_include_directories(y_absl-debugging-symbolize PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-debugging-symbolize PUBLIC
+target_link_libraries(y_absl-debugging-symbolize PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
 )
-target_sources(yabsl-debugging-symbolize PRIVATE
+target_sources(y_absl-debugging-symbolize PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/demangle/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/demangle/CMakeLists.txt
index f404e28ea54..7dbfc529606 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/demangle/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/demangle/CMakeLists.txt
@@ -7,18 +7,18 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-demangle)
-target_include_directories(yabseil-cpp-tstring-y_absl-demangle PUBLIC
+add_library(abseil-cpp-tstring-y_absl-demangle)
+target_include_directories(abseil-cpp-tstring-y_absl-demangle PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-demangle PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-demangle PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(yabseil-cpp-tstring-y_absl-demangle PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-demangle PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
index 1237e97b763..d29cb14fd9d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(abseil-cpp-tstring-y_absl-functional INTERFACE)
-target_link_libraries(abseil-cpp-tstring-y_absl-functional INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
index ef277ad287a..a15250bc68e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
@@ -7,28 +7,28 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-hash)
-target_include_directories(yabseil-cpp-tstring-y_absl-hash PUBLIC
+add_library(abseil-cpp-tstring-y_absl-hash)
+target_include_directories(abseil-cpp-tstring-y_absl-hash PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-hash PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-hash PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-city
-  yabsl-hash-internal
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabsl-types-bad_optional_access
-  yabsl-types-bad_variant_access
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-city
+  y_absl-hash-internal
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
   abseil-cpp-tstring-y_absl-types
+  y_absl-types-bad_optional_access
+  y_absl-types-bad_variant_access
   y_absl-types-internal
 )
-target_sources(yabseil-cpp-tstring-y_absl-hash PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-hash PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/CMakeLists.txt
index 19033b72aa6..2e38af505d7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/CMakeLists.txt
@@ -7,19 +7,19 @@
 
 
 
-add_library(yabsl-hash-internal)
-target_include_directories(yabsl-hash-internal PUBLIC
+add_library(y_absl-hash-internal)
+target_include_directories(y_absl-hash-internal PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-hash-internal PUBLIC
+target_link_libraries(y_absl-hash-internal PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-numeric
 )
-target_sources(yabsl-hash-internal PRIVATE
+target_sources(y_absl-hash-internal PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
index 4cb0fc84c7b..e311296372b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
@@ -9,7 +9,5 @@
 
 add_library(abseil-cpp-tstring-y_absl-memory INTERFACE)
 target_link_libraries(abseil-cpp-tstring-y_absl-memory INTERFACE
-  contrib-libs-cxxsupp
-  yutil
   abseil-cpp-tstring-y_absl-meta
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
index b05d49c4fa5..c8845db2e44 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
@@ -9,7 +9,5 @@
 
 add_library(abseil-cpp-tstring-y_absl-meta INTERFACE)
 target_link_libraries(abseil-cpp-tstring-y_absl-meta INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-  yabseil-cpp-tstring-y_absl-base
+  abseil-cpp-tstring-y_absl-base
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
index ff6af4f2f9f..6dacd0ea9b5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-numeric)
-target_include_directories(yabseil-cpp-tstring-y_absl-numeric PUBLIC
+add_library(abseil-cpp-tstring-y_absl-numeric)
+target_include_directories(abseil-cpp-tstring-y_absl-numeric PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-numeric PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-numeric PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(yabseil-cpp-tstring-y_absl-numeric PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-numeric PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased/CMakeLists.txt
index 273be0e6563..fc8c6b4dc4b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased/CMakeLists.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(yprofiling-internal-exponential_biased)
-target_include_directories(yprofiling-internal-exponential_biased PUBLIC
+add_library(profiling-internal-exponential_biased)
+target_include_directories(profiling-internal-exponential_biased PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yprofiling-internal-exponential_biased PUBLIC
+target_link_libraries(profiling-internal-exponential_biased PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(yprofiling-internal-exponential_biased PRIVATE
+target_sources(profiling-internal-exponential_biased PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/exponential_biased.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
index 13f8b5f966c..340467959a3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
@@ -7,41 +7,41 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-status)
-target_include_directories(yabseil-cpp-tstring-y_absl-status PUBLIC
+add_library(abseil-cpp-tstring-y_absl-status)
+target_include_directories(abseil-cpp-tstring-y_absl-status PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-status PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-status PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-strings
-  yabsl-strings-cord
-  ystrings-internal-absl_cord_internal
-  ystrings-internal-absl_strings_internal
-  ystrings-internal-cordz_functions
-  ystrings-internal-cordz_handle
-  ystrings-internal-cordz_info
-  ystrings-internal-str_format
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
-  yabsl-types-bad_optional_access
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-strings
+  y_absl-strings-cord
+  strings-internal-absl_cord_internal
+  strings-internal-absl_strings_internal
+  strings-internal-cordz_functions
+  strings-internal-cordz_handle
+  strings-internal-cordz_info
+  strings-internal-str_format
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
+  y_absl-types-bad_optional_access
 )
-target_sources(yabseil-cpp-tstring-y_absl-status PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-status PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/status/status_payload_printer.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor/CMakeLists.txt
index 472b72f1e85..0eaa304b750 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor/CMakeLists.txt
@@ -7,42 +7,42 @@
 
 
 
-add_library(yabsl-status-statusor)
-target_include_directories(yabsl-status-statusor PUBLIC
+add_library(y_absl-status-statusor)
+target_include_directories(y_absl-status-statusor PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-status-statusor PUBLIC
+target_link_libraries(y_absl-status-statusor PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-status
-  yabseil-cpp-tstring-y_absl-strings
-  yabsl-strings-cord
-  ystrings-internal-absl_cord_internal
-  ystrings-internal-absl_strings_internal
-  ystrings-internal-cordz_functions
-  ystrings-internal-cordz_handle
-  ystrings-internal-cordz_info
-  ystrings-internal-str_format
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
-  yabsl-types-bad_optional_access
-  yabsl-types-bad_variant_access
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-status
+  abseil-cpp-tstring-y_absl-strings
+  y_absl-strings-cord
+  strings-internal-absl_cord_internal
+  strings-internal-absl_strings_internal
+  strings-internal-cordz_functions
+  strings-internal-cordz_handle
+  strings-internal-cordz_info
+  strings-internal-str_format
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
+  y_absl-types-bad_optional_access
+  y_absl-types-bad_variant_access
 )
-target_sources(yabsl-status-statusor PRIVATE
+target_sources(y_absl-status-statusor PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
index 280c1b9cc7f..a4af141d40f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
@@ -7,22 +7,22 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-strings)
-target_include_directories(yabseil-cpp-tstring-y_absl-strings PUBLIC
+add_library(abseil-cpp-tstring-y_absl-strings)
+target_include_directories(abseil-cpp-tstring-y_absl-strings PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-strings PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-strings PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-numeric
-  ystrings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-numeric
+  strings-internal-absl_strings_internal
 )
-target_sources(yabseil-cpp-tstring-y_absl-strings PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-strings PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ascii.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/charconv.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord/CMakeLists.txt
index 05f2c246806..253e618e928 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord/CMakeLists.txt
@@ -7,43 +7,43 @@
 
 
 
-add_library(yabsl-strings-cord)
-target_include_directories(yabsl-strings-cord PUBLIC
+add_library(y_absl-strings-cord)
+target_include_directories(y_absl-strings-cord PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-strings-cord PUBLIC
+target_link_libraries(y_absl-strings-cord PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_cord_internal
-  ystrings-internal-absl_strings_internal
-  ystrings-internal-cordz_functions
-  ystrings-internal-cordz_handle
-  ystrings-internal-cordz_info
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
-  yabsl-types-bad_optional_access
   abseil-cpp-tstring-y_absl-algorithm
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
   abseil-cpp-tstring-y_absl-container
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
   abseil-cpp-tstring-y_absl-functional
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_cord_internal
+  strings-internal-absl_strings_internal
+  strings-internal-cordz_functions
+  strings-internal-cordz_handle
+  strings-internal-cordz_info
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
   abseil-cpp-tstring-y_absl-types
+  y_absl-types-bad_optional_access
   abseil-cpp-tstring-y_absl-utility
 )
-target_sources(yabsl-strings-cord PRIVATE
+target_sources(y_absl-strings-cord PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal/CMakeLists.txt
index 0cf5a12ac0f..2daae1abe2d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_cord_internal/CMakeLists.txt
@@ -7,23 +7,23 @@
 
 
 
-add_library(ystrings-internal-absl_cord_internal)
-target_include_directories(ystrings-internal-absl_cord_internal PUBLIC
+add_library(strings-internal-absl_cord_internal)
+target_include_directories(strings-internal-absl_cord_internal PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-absl_cord_internal PUBLIC
+target_link_libraries(strings-internal-absl_cord_internal PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
 )
-target_sources(ystrings-internal-absl_cord_internal PRIVATE
+target_sources(strings-internal-absl_cord_internal PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_internal.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree_navigator.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal/CMakeLists.txt
index 7d008ef6287..e22b7ca7460 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/absl_strings_internal/CMakeLists.txt
@@ -7,19 +7,19 @@
 
 
 
-add_library(ystrings-internal-absl_strings_internal)
-target_include_directories(ystrings-internal-absl_strings_internal PUBLIC
+add_library(strings-internal-absl_strings_internal)
+target_include_directories(strings-internal-absl_strings_internal PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-absl_strings_internal PUBLIC
+target_link_libraries(strings-internal-absl_strings_internal PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(ystrings-internal-absl_strings_internal PRIVATE
+target_sources(strings-internal-absl_strings_internal PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/escaping.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/ostringstream.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/utf8.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions/CMakeLists.txt
index 07860d1ad03..6f6666f1cea 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions/CMakeLists.txt
@@ -7,17 +7,17 @@
 
 
 
-add_library(ystrings-internal-cordz_functions)
-target_include_directories(ystrings-internal-cordz_functions PUBLIC
+add_library(strings-internal-cordz_functions)
+target_include_directories(strings-internal-cordz_functions PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-cordz_functions PUBLIC
+target_link_libraries(strings-internal-cordz_functions PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
-  yprofiling-internal-exponential_biased
+  base-internal-raw_logging
+  y_absl-base-log_severity
+  profiling-internal-exponential_biased
 )
-target_sources(ystrings-internal-cordz_functions PRIVATE
+target_sources(strings-internal-cordz_functions PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle/CMakeLists.txt
index f420974ade3..e58cdd1cd53 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle/CMakeLists.txt
@@ -7,32 +7,32 @@
 
 
 
-add_library(ystrings-internal-cordz_handle)
-target_include_directories(ystrings-internal-cordz_handle PUBLIC
+add_library(strings-internal-cordz_handle)
+target_include_directories(strings-internal-cordz_handle PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-cordz_handle PUBLIC
+target_link_libraries(strings-internal-cordz_handle PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
 )
-target_sources(ystrings-internal-cordz_handle PRIVATE
+target_sources(strings-internal-cordz_handle PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info/CMakeLists.txt
index 57dc0bce08b..136e9bf5e9b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info/CMakeLists.txt
@@ -7,36 +7,36 @@
 
 
 
-add_library(ystrings-internal-cordz_info)
-target_include_directories(ystrings-internal-cordz_info PUBLIC
+add_library(strings-internal-cordz_info)
+target_include_directories(strings-internal-cordz_info PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-cordz_info PUBLIC
+target_link_libraries(strings-internal-cordz_info PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yprofiling-internal-exponential_biased
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_cord_internal
-  ystrings-internal-absl_strings_internal
-  ystrings-internal-cordz_functions
-  ystrings-internal-cordz_handle
-  yabseil-cpp-tstring-y_absl-synchronization
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  profiling-internal-exponential_biased
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_cord_internal
+  strings-internal-absl_strings_internal
+  strings-internal-cordz_functions
+  strings-internal-cordz_handle
+  abseil-cpp-tstring-y_absl-synchronization
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
 )
-target_sources(ystrings-internal-cordz_info PRIVATE
+target_sources(strings-internal-cordz_info PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/CMakeLists.txt
index 68e990f7d9c..54b6a7cb77a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/CMakeLists.txt
@@ -7,23 +7,23 @@
 
 
 
-add_library(ystrings-internal-str_format)
-target_include_directories(ystrings-internal-str_format PUBLIC
+add_library(strings-internal-str_format)
+target_include_directories(strings-internal-str_format PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(ystrings-internal-str_format PUBLIC
+target_link_libraries(strings-internal-str_format PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
 )
-target_sources(ystrings-internal-str_format PRIVATE
+target_sources(strings-internal-str_format PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/arg.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/bind.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/extension.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
index da51a8bd44c..b961fe803b8 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
@@ -7,32 +7,32 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-synchronization)
-target_include_directories(yabseil-cpp-tstring-y_absl-synchronization PUBLIC
+add_library(abseil-cpp-tstring-y_absl-synchronization)
+target_include_directories(abseil-cpp-tstring-y_absl-synchronization PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-synchronization PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-synchronization PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-debugging
-  yabsl-debugging-stacktrace
-  yabsl-debugging-symbolize
-  yabseil-cpp-tstring-y_absl-demangle
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabsl-synchronization-internal
-  yabseil-cpp-tstring-y_absl-time
-  yabsl-time-civil_time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-debugging
+  y_absl-debugging-stacktrace
+  y_absl-debugging-symbolize
+  abseil-cpp-tstring-y_absl-demangle
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
+  y_absl-synchronization-internal
+  abseil-cpp-tstring-y_absl-time
+  y_absl-time-civil_time
+  y_absl-time-time_zone
 )
-target_sources(yabseil-cpp-tstring-y_absl-synchronization PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-synchronization PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/barrier.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/blocking_counter.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/create_thread_identity.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/CMakeLists.txt
index a7f1a4643f5..795183ae23c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/CMakeLists.txt
@@ -7,19 +7,19 @@
 
 
 
-add_library(yabsl-synchronization-internal)
-target_include_directories(yabsl-synchronization-internal PUBLIC
+add_library(y_absl-synchronization-internal)
+target_include_directories(y_absl-synchronization-internal PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-synchronization-internal PUBLIC
+target_link_libraries(y_absl-synchronization-internal PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-low_level_alloc
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  yabsl-base-log_severity
+  abseil-cpp-tstring-y_absl-base
+  base-internal-low_level_alloc
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  y_absl-base-log_severity
 )
-target_sources(yabsl-synchronization-internal PRIVATE
+target_sources(y_absl-synchronization-internal PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
index 6cf8369bf0b..0beccd33344 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
@@ -7,25 +7,25 @@
 
 
 
-add_library(yabseil-cpp-tstring-y_absl-time)
-target_include_directories(yabseil-cpp-tstring-y_absl-time PUBLIC
+add_library(abseil-cpp-tstring-y_absl-time)
+target_include_directories(abseil-cpp-tstring-y_absl-time PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabseil-cpp-tstring-y_absl-time PUBLIC
+target_link_libraries(abseil-cpp-tstring-y_absl-time PUBLIC
   contrib-libs-cxxsupp
   yutil
-  yabseil-cpp-tstring-y_absl-base
-  ybase-internal-raw_logging
-  ybase-internal-spinlock_wait
-  ybase-internal-throw_delegate
-  yabsl-base-log_severity
-  yabseil-cpp-tstring-y_absl-numeric
-  yabseil-cpp-tstring-y_absl-strings
-  ystrings-internal-absl_strings_internal
-  yabsl-time-civil_time
-  yabsl-time-time_zone
+  abseil-cpp-tstring-y_absl-base
+  base-internal-raw_logging
+  base-internal-spinlock_wait
+  base-internal-throw_delegate
+  y_absl-base-log_severity
+  abseil-cpp-tstring-y_absl-numeric
+  abseil-cpp-tstring-y_absl-strings
+  strings-internal-absl_strings_internal
+  y_absl-time-civil_time
+  y_absl-time-time_zone
 )
-target_sources(yabseil-cpp-tstring-y_absl-time PRIVATE
+target_sources(abseil-cpp-tstring-y_absl-time PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/clock.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/duration.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time/CMakeLists.txt
index 7d0cd86df1c..95f0a17d974 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time/CMakeLists.txt
@@ -7,14 +7,14 @@
 
 
 
-add_library(yabsl-time-civil_time)
-target_include_directories(yabsl-time-civil_time PUBLIC
+add_library(y_absl-time-civil_time)
+target_include_directories(y_absl-time-civil_time PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-time-civil_time PUBLIC
+target_link_libraries(y_absl-time-civil_time PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(yabsl-time-civil_time PRIVATE
+target_sources(y_absl-time-civil_time PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/civil_time_detail.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone/CMakeLists.txt
index f53c15e4a96..7dd16f17358 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/time_zone/CMakeLists.txt
@@ -7,15 +7,15 @@
 
 
 
-add_library(yabsl-time-time_zone)
-target_include_directories(yabsl-time-time_zone PUBLIC
+add_library(y_absl-time-time_zone)
+target_include_directories(y_absl-time-time_zone PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-time-time_zone PUBLIC
+target_link_libraries(y_absl-time-time_zone PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(yabsl-time-time_zone PRIVATE
+target_sources(y_absl-time-time_zone PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_fixed.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_format.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_if.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
index 571e83653f2..885607e13e3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(abseil-cpp-tstring-y_absl-types INTERFACE)
-target_link_libraries(abseil-cpp-tstring-y_absl-types INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access/CMakeLists.txt
index 29785756954..34e73227f52 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access/CMakeLists.txt
@@ -7,16 +7,16 @@
 
 
 
-add_library(yabsl-types-bad_optional_access)
-target_include_directories(yabsl-types-bad_optional_access PUBLIC
+add_library(y_absl-types-bad_optional_access)
+target_include_directories(y_absl-types-bad_optional_access PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-types-bad_optional_access PUBLIC
+target_link_libraries(y_absl-types-bad_optional_access PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
+  base-internal-raw_logging
+  y_absl-base-log_severity
 )
-target_sources(yabsl-types-bad_optional_access PRIVATE
+target_sources(y_absl-types-bad_optional_access PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_optional_access.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access/CMakeLists.txt
index ee5546b1100..33c99f48c3e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access/CMakeLists.txt
@@ -7,16 +7,16 @@
 
 
 
-add_library(yabsl-types-bad_variant_access)
-target_include_directories(yabsl-types-bad_variant_access PUBLIC
+add_library(y_absl-types-bad_variant_access)
+target_include_directories(y_absl-types-bad_variant_access PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring
 )
-target_link_libraries(yabsl-types-bad_variant_access PUBLIC
+target_link_libraries(y_absl-types-bad_variant_access PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ybase-internal-raw_logging
-  yabsl-base-log_severity
+  base-internal-raw_logging
+  y_absl-base-log_severity
 )
-target_sources(yabsl-types-bad_variant_access PRIVATE
+target_sources(y_absl-types-bad_variant_access PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp-tstring/y_absl/types/bad_variant_access.cc
 )
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/CMakeLists.txt
index ec974900198..70478707330 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(y_absl-types-internal INTERFACE)
-target_link_libraries(y_absl-types-internal INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
index ca219c52de5..ec6db3764bd 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
@@ -8,7 +8,3 @@
 
 
 add_library(abseil-cpp-tstring-y_absl-utility INTERFACE)
-target_link_libraries(abseil-cpp-tstring-y_absl-utility INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)